re PR tree-optimization/61383 (wrong code at -O2 and -O3 on x86_64-linux-gnu)

2014-06-03  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/61383
	* tree-ssa-ifcombine.c (bb_no_side_effects_p): Make sure
	stmts can't trap.

	* gcc.dg/torture/pr61383-1.c: New testcase.

From-SVN: r211163

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6d9dab7..ea18c51 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-03  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/61383
+       * tree-ssa-ifcombine.c (bb_no_side_effects_p): Make sure
+       stmts can't trap.
+
 2014-06-03  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * defaults.h (USE_MD_CONSTRAINTS, EXTRA_MEMORY_CONSTRAINT)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9a7bb27..9c0e9fb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-03  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/61383
+       * gcc.dg/torture/pr61383-1.c: New testcase.
+
 2014-06-03  Andreas Schwab  <schwab@linux-m68k.org>
 
        * gcc.target/powerpc/vsxcopy.c (dg-options): Add -mvsx.

diff --git a/gcc/testsuite/gcc.dg/torture/pr61383-1.c b/gcc/testsuite/gcc.dg/torture/pr61383-1.c
new file mode 100644 (file)
index 0000000..d9a0a0b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr61383-1.c
@@ -0,0 +1,35 @@
+/* { dg-do run } */
+
+int a, b = 1, c, d, e, f, g;
+
+int
+fn1 ()
+{
+  int h;
+  for (;;)
+    {
+      g = b;
+      g = g ? 0 : 1 % g;
+      e = a + 1;
+      for (; d < 1; d = e)
+       {
+         if (f == 0)
+           h = 0;
+         else
+           h = 1 % f;
+         if (f < 1)
+           c = 0;
+         else if (h)
+           break;
+       }
+      if (b)
+       return 0;
+    }
+}
+
+int
+main ()
+{
+  fn1 ();
+  return 0;
+}

diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c
index fae389b..fa3c5b1 100644 (file)
--- a/gcc/tree-ssa-ifcombine.c
+++ b/gcc/tree-ssa-ifcombine.c
@@ -127,7 +127,11 @@ bb_no_side_effects_p (basic_block bb)
     {
       gimple stmt = gsi_stmt (gsi);
 
+      if (is_gimple_debug (stmt))
+       continue;
+
       if (gimple_has_side_effects (stmt)
+         || gimple_could_trap_p (stmt)
          || gimple_vuse (stmt))
        return false;
     }