aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-04-26 10:24:28 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2006-04-26 10:24:28 +0200
commit07ed51c9cee029feb2ad2f8431cbdc60ed395fe3 (patch)
tree26c0535fb503f2609e6c8641367f2666b6ffcb55
parent1562e1fee7c5eec57c05a37c7dca6d4c333dbf7f (diff)
downloadgcc-07ed51c9cee029feb2ad2f8431cbdc60ed395fe3.zip
gcc-07ed51c9cee029feb2ad2f8431cbdc60ed395fe3.tar.gz
gcc-07ed51c9cee029feb2ad2f8431cbdc60ed395fe3.tar.bz2
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
-rw-r--r--gcc/ChangeLog3
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/g++.dg/gomp/pr26913.C19
-rw-r--r--gcc/tree-cfg.c5
4 files changed, 29 insertions, 1 deletions
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 <jakub@redhat.com>
+ 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 <jakub@redhat.com>
+ 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)