re PR rtl-optimization/12215 (ICE in make_label_edge with -fnon-call-exceptions ...
authorEric Botcazou <ebotcazou@gcc.gnu.org>
Mon, 6 Oct 2003 09:18:01 +0000 (09:18 +0000)
committerEric Botcazou <ebotcazou@gcc.gnu.org>
Mon, 6 Oct 2003 09:18:01 +0000 (09:18 +0000)
PR optimization/12215
* cse.c (cse_set_around_loop): Emit the move at the beginning
of the next basic block for trapping sets.

From-SVN: r72141

gcc/ChangeLog
gcc/cse.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/opt/cfg2.C [new file with mode: 0644]

index 2e56e27f813769fcd538d4e921b832e9089c0c22..a0112d2ca75da3ca1cf694a5aa178177b2d2007c 100644 (file)
@@ -1,3 +1,9 @@
+2003-10-06  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       PR optimization/12215
+       * cse.c (cse_set_around_loop): Emit the move at the beginning
+       of the next basic block for trapping sets.
+
 2003-10-06  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        PR optimization/11637
index a4847a857b33af093ffa83707c5e51f4cbd6618e..30355df5f79401615ed02bfff8ebfb510a906746 100644 (file)
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -6666,7 +6666,15 @@ cse_set_around_loop (rtx x, rtx insn, rtx loop_start)
                              abort ();
                          }
                        else
-                         emit_insn_after (move, p);
+                         {
+                           if (control_flow_insn_p (p))
+                             /* p can cause a control flow transfer so it
+                                is the last insn of a basic block.  We can't
+                                therefore use emit_insn_after.  */
+                             emit_insn_before (move, next_nonnote_insn (p));
+                           else
+                             emit_insn_after (move, p);
+                         }
                      }
                    break;
                  }
index 0264d7a5012c3a477e7f0c3632d5f16edd92510b..48761b7cb2cefb1794947abb63d69ead23a40177 100644 (file)
@@ -1,3 +1,7 @@
+2003-10-06  Wolfgang Bangerth  <bangerth@ticam.utexas.edu>
+
+       * g++.dg/opt/cfg2.C: New test.
+
 2003-10-06  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        * g++.dg/opt/float1.C: New test.
diff --git a/gcc/testsuite/g++.dg/opt/cfg2.C b/gcc/testsuite/g++.dg/opt/cfg2.C
new file mode 100644 (file)
index 0000000..229f4bc
--- /dev/null
@@ -0,0 +1,38 @@
+// PR optimization/12215
+// Origin: <nick@ilm.com>
+// Reduced testcase by Wolfgang Bangerth <bangerth@ticam.utexas.edu>
+
+// This used to fail because the CSE pass destroyed the CFG in presence
+// of trapping loads, which led to the deletion of basic blocks.
+
+// { dg-do compile }
+// { dg-options "-O2 -fno-gcse -fnon-call-exceptions" }
+
+
+struct B {
+  ~B() throw() {}
+};
+
+struct X {
+  X(const char*, const B&);
+  ~X() {}
+};
+
+bool m();
+void f(int &i, float &arg0);
+
+void g (const char **argv) {
+  float val;
+  int i = 1;
+
+  try {
+    while ( i < 1 )
+      {
+        X arg(argv[i], B());
+        if (m())
+          throw(0);
+
+        f(i, val);
+      }
+  } catch (...) {}
+}