summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>2014-06-16 07:40:17 +0000
committerrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>2014-06-16 07:40:17 +0000
commite8403abd0aa13b7b792d6ebe295b3d68406839ca (patch)
tree294d42cd653258589e7430d222ec1ea371b75126
parent1153fb2a77df8434cefcb090a0e8df7236bf82d6 (diff)
downloadgcc-e8403abd0aa13b7b792d6ebe295b3d68406839ca.tar.gz
gcc/
PR bootstrap/61516 * auto-inc-dec.c (merge_in_block): Fix location of insn_info initialization. Replace remaining use of uid. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211694 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/auto-inc-dec.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1917c285a67..756ed9fdf1e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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.
diff --git a/gcc/auto-inc-dec.c b/gcc/auto-inc-dec.c
index 64a370655f6..1007d724e4f 100644
--- a/gcc/auto-inc-dec.c
+++ b/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