re PR regression/61516 (build fails on auto-inc-dec.c or libgcc2.c with obvious patch)

gcc/
	PR bootstrap/61516
	* auto-inc-dec.c (merge_in_block): Fix location of insn_info
	initialization.  Replace remaining use of uid.

From-SVN: r211694

gcc/ChangeLog

+2014-06-16  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	PR bootstrap/61516
+	* auto-inc-dec.c (merge_in_block): Fix location of insn_info
+	initialization.  Replace remaining use of uid.
+
 2014-06-15  Jan Hubicka  <hubicka@ucw.cz>
 
 	* c-family/c-common.c (handle_tls_model_attribute): Use set_decl_tls_model.

gcc/auto-inc-dec.c

@@ -1341,7 +1341,6 @@ merge_in_block (int max_reg, basic_block bb)
 
   FOR_BB_INSNS_REVERSE_SAFE (bb, insn, curr)
     {
-      df_insn_info *insn_info = DF_INSN_INFO_GET (insn);
       bool insn_is_add_or_inc = true;
 
       if (!NONDEBUG_INSN_P (insn))
@@ -1417,7 +1416,7 @@ merge_in_block (int max_reg, basic_block bb)
 
       /* If the inc insn was merged with a mem, the inc insn is gone
 	 and there is noting to update.  */
-      if (insn_info)
+      if (df_insn_info *insn_info = DF_INSN_INFO_GET (insn))
 	{
 	  df_ref def, use;
 
@@ -1439,7 +1438,8 @@ merge_in_block (int max_reg, basic_block bb)
 	    }
 	}
       else if (dump_file)
-	fprintf (dump_file, "skipping update of deleted insn %d\n", uid);
+	fprintf (dump_file, "skipping update of deleted insn %d\n",
+		 INSN_UID (insn));
     }
 
   /* If we were successful, try again.  There may have been several