From 7aa5d8b6abb11da4a0f5cd37512d759e593431c3 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Thu, 24 Jan 2008 15:59:18 +0000 Subject: [PATCH] re PR c++/34953 (ICE on destructor + noreturn-function at -O3) 2008-01-24 Richard Guenther 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 --- gcc/ChangeLog | 6 ++++++ gcc/predict.c | 8 ++++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/torture/pr34953.C | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/torture/pr34953.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4d5341e13f8a..b89f2d9ff2c9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-01-24 Richard Guenther + + PR middle-end/34953 + * predict.c (apply_return_prediction): Check for empty blocks. + (tree_estimate_probability): Likewise. + 2008-01-23 Richard Guenther Backport from mainline diff --git a/gcc/predict.c b/gcc/predict.c index 8b356e5eb932..ad78c323af15 100644 --- 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 12ddd8ef2cac..5a2d6c7e258f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-01-24 Richard Guenther + + PR middle-end/34953 + * g++.dg/torture/pr34953.C: New testcase. + 2008-01-22 Eric Botcazou * 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 index 000000000000..5d7b38c92e61 --- /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) */ +} + -- 2.47.2