re PR c++/34953 (ICE on destructor + noreturn-function at -O3)

2008-01-24  Richard Guenther  <rguenther@suse.de>

	PR middle-end/34953
	* predict.c (apply_return_prediction): Check for empty blocks.
	(tree_estimate_probability): Likewise.

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

From-SVN: r131781

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d5341e13f8a4bc4718a04c31002a6940f3757d0..b89f2d9ff2c9e8e037f7577cf28de7c6a58fc3d1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-24  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/34953
+       * predict.c (apply_return_prediction): Check for empty blocks.
+       (tree_estimate_probability): Likewise.
+
 2008-01-23  Richard Guenther  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/gcc/predict.c b/gcc/predict.c
index 8b356e5eb932a7ec698c286d8bd2e74fcbc80dfb..ad78c323af15f04f06e21c6a3d38a8123d766a59 100644 (file)
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -1198,7 +1198,8 @@ apply_return_prediction (int *heads)
   FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR->preds)
     {
       return_stmt = last_stmt (e->src);
-      if (TREE_CODE (return_stmt) == RETURN_EXPR)
+      if (return_stmt
+         && TREE_CODE (return_stmt) == RETURN_EXPR)
        break;
     }
   if (!e)
@@ -1311,11 +1312,14 @@ tree_estimate_probability (void)
 
       FOR_EACH_EDGE (e, ei, bb->succs)
        {
+         tree tmp;
+
          /* Predict early returns to be probable, as we've already taken
             care for error returns and other cases are often used for
             fast paths through function.  */
          if (e->dest == EXIT_BLOCK_PTR
-             && TREE_CODE (last_stmt (bb)) == RETURN_EXPR
+             && (tmp = last_stmt (bb))
+             && TREE_CODE (tmp) == RETURN_EXPR
              && !single_pred_p (bb))
            {
              edge e1;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 12ddd8ef2cac105a55571207b240bf60fc202fa0..5a2d6c7e258f66e584ddc0495743899bcf043a87 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-24  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/34953
+       * g++.dg/torture/pr34953.C: New testcase.
+
 2008-01-22  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc.c-torture/execute/20080122-1.c: New test.

diff --git a/gcc/testsuite/g++.dg/torture/pr34953.C b/gcc/testsuite/g++.dg/torture/pr34953.C
new file mode 100644 (file)
index 0000000..5d7b38c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr34953.C
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-w" } */
+
+void B_CLEAR(void* ret);
+void B_NeverReturns(void* ret) __attribute__((noreturn));
+
+int main()
+{
+    const struct AutoErrPop { ~AutoErrPop() { } } AutoErrPopper = { };
+    B_NeverReturns(0);
+}
+
+void B_NeverReturns(void* ret)
+{
+    B_CLEAR(ret); /* Never returns (does a setjmp/goto) */
+}
+