From 07ed51c9cee029feb2ad2f8431cbdc60ed395fe3 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 26 Apr 2006 10:24:28 +0200 Subject: [PATCH] re PR middle-end/26913 (ICE with -fopenmp and -O1) PR middle-end/26913 * tree-cfg.c (find_outermost_region_in_block): Handle RESX_EXPR. * g++.dg/gomp/pr26913.C: New test. From-SVN: r113270 --- gcc/ChangeLog | 3 +++ gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/gomp/pr26913.C | 19 +++++++++++++++++++ gcc/tree-cfg.c | 5 ++++- 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/gomp/pr26913.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0a3504d..ebec042 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2006-04-26 Jakub Jelinek + PR middle-end/26913 + * tree-cfg.c (find_outermost_region_in_block): Handle RESX_EXPR. + PR c/25996 * c-parser.c (c_parser_omp_for_loop): Don't call c_finish_omp_for if either decl or init is error_mark_node. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c59270d..e3f19e0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2006-04-26 Jakub Jelinek + PR middle-end/26913 + * g++.dg/gomp/pr26913.C: New test. + PR c/25996 * gcc.dg/gomp/pr25996.c: New test. * g++.dg/gomp/pr25996.C: New test. diff --git a/gcc/testsuite/g++.dg/gomp/pr26913.C b/gcc/testsuite/g++.dg/gomp/pr26913.C new file mode 100644 index 0000000..4f5bb28 --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/pr26913.C @@ -0,0 +1,19 @@ +// PR middle-end/26913 + +struct A +{ + ~A () throw (); +}; + +void foo (A); + +A bar () throw (); + +void baz () +{ +#pragma omp parallel + { + A a; + foo (bar ()); + } +} diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 7913e52..9ae48eb 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -4744,7 +4744,10 @@ find_outermost_region_in_block (struct function *src_cfun, tree stmt = bsi_stmt (si); int stmt_region; - stmt_region = lookup_stmt_eh_region_fn (src_cfun, stmt); + if (TREE_CODE (stmt) == RESX_EXPR) + stmt_region = TREE_INT_CST_LOW (TREE_OPERAND (stmt, 0)); + else + stmt_region = lookup_stmt_eh_region_fn (src_cfun, stmt); if (stmt_region > 0) { if (region < 0) -- 2.7.4