re PR tree-optimization/49615 (internal compiler error: verify_stmts failed / LHS...

2011-07-04  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/49615
	* tree-cfgcleanup.c (split_bbs_on_noreturn_calls): Fix
	basic-block index check.

	* g++.dg/torture/pr49615.C: New testcase.

From-SVN: r175808

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fb7d2153c20ec142e7d5160356e4c8a2757975eb..01f8d5f9aba1594b7a704a718baf4d8ac4546dc7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-04  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/49615
+       * tree-cfgcleanup.c (split_bbs_on_noreturn_calls): Fix
+       basic-block index check.
+
 2011-06-30  Eric Botcazou  <ebotcazou@adacore.com>
 
        PR tree-optimization/49572

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4a4402ad726816e2e3c597b4ec6e4c57aed27086..30dafc7a235fbaf50608c7d73149e91f2d440117 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-04  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/49615
+       * g++.dg/torture/pr49615.C: New testcase.
+
 2011-06-30  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/38752

diff --git a/gcc/testsuite/g++.dg/torture/pr49615.C b/gcc/testsuite/g++.dg/torture/pr49615.C
new file mode 100644 (file)
index 0000000..98a2f95
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr49615.C
@@ -0,0 +1,29 @@
+/* { dg-do compile } */
+/* { dg-options "-g" } */
+
+template <class T>
+static inline bool Dispatch (T* obj, void (T::*func) ())
+{
+  (obj->*func) ();
+}
+class C
+{
+  bool f (int);
+  void g ();
+};
+bool C::f (int n)
+{
+  bool b;
+  switch (n)
+    {
+      case 0:
+         b = Dispatch (this, &C::g);
+      case 1:
+         b = Dispatch (this, &C::g);
+    }
+}
+void C::g ()
+{
+  for (;;) { }
+}
+

diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index a68dc5c5902d2197a213badd58f118ba0d8b9c02..f0270af49ab05aff757c9ddc3c5904341d796c9d 100644 (file)
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -496,7 +496,7 @@ split_bbs_on_noreturn_calls (void)
           BB is present in the cfg.  */
        if (bb == NULL
            || bb->index < NUM_FIXED_BLOCKS
-           || bb->index >= n_basic_blocks
+           || bb->index >= last_basic_block
            || BASIC_BLOCK (bb->index) != bb
            || last_stmt (bb) == stmt
            || !gimple_call_noreturn_p (stmt))