re PR middle-end/58418 (wrong code at -O2 and -O3 on x86_64-linux-gnu (in 32-bit mode))

2013-09-16  Vladimir Makarov  <vmakarov@redhat.com>

	PR middle-end/58418
	* lra-constraints.c (undo_optional_reloads): Consider all optional
	reload even if it did not get a hard reg.

2013-09-16  Vladimir Makarov  <vmakarov@redhat.com>

	* gcc.target/i386/pr58418.c: New.

From-SVN: r202630

gcc/ChangeLog

+2013-09-16  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR middle-end/58418
+	* lra-constraints.c (undo_optional_reloads): Consider all optional
+	reload even if it did not get a hard reg.
+
 2013-09-16  Teresa Johnson  <tejohnson@google.com>
 
 	* dumpfile.c (dump_loc): Remove newline emission.

gcc/lra-constraints.c

@@ -5454,7 +5454,6 @@ undo_optional_reloads (void)
   bitmap_initialize (&removed_optional_reload_pseudos, &reg_obstack);
   bitmap_copy (&removed_optional_reload_pseudos, &lra_optional_reload_pseudos);
   EXECUTE_IF_SET_IN_BITMAP (&lra_optional_reload_pseudos, 0, regno, bi)
-    if (reg_renumber[regno] >= 0)
     {
       keep_p = false;
       if (reg_renumber[lra_reg_info[regno].restore_regno] >= 0)
@@ -5462,7 +5461,7 @@ undo_optional_reloads (void)
 	   removing the optional pseudo is dangerous as the original
 	   pseudo will have longer live range.  */
 	keep_p = true;
-	else
+      else if (reg_renumber[regno] >= 0)
 	EXECUTE_IF_SET_IN_BITMAP (&lra_reg_info[regno].insn_bitmap, 0, uid, bi2)
 	  {
 	    insn = lra_insn_recog_data[uid]->insn;

gcc/testsuite/ChangeLog

+2013-09-16  Vladimir Makarov  <vmakarov@redhat.com>
+
+	* gcc.target/i386/pr58418.c: New.
+
 2013-09-16  James Greenhalgh  <james.greenhalgh@arm.com>
 
 	* gcc.target/aarch64/fmla-intrinsic.c: New.

gcc/testsuite/gcc.target/i386/pr58418.c

+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+extern void abort (void);
+int a, b, *c = &b, d = -1, e, f, *g, *h = &f, **i = &g, j;
+
+unsigned int
+foo (unsigned int p)
+{
+  return p == 0 ? 0 : 1 / p;
+}
+
+static int *
+bar ()
+{
+  *c = *h = foo (d) & (-9 < d);
+  for (e = 0; e; e++)
+    ;
+  return 0;
+}
+
+int
+main ()
+{
+  for (; j; j++)
+    for (;; a--)
+      ;
+  *i = bar ();
+  if (f != 0)
+    abort ();
+  return 0;
+}