aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-03-10 20:39:30 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2008-03-10 20:39:30 +0100
commit8b46837cd1feb7d5f9d7c01b28ddb2b4d3ee455e (patch)
treee7427aeb89403e376f2ec5442aca8c328cc8f960 /gcc
parente1e7141cf3128d384dca902928d98a47cb57dddd (diff)
downloadgcc-8b46837cd1feb7d5f9d7c01b28ddb2b4d3ee455e.zip
gcc-8b46837cd1feb7d5f9d7c01b28ddb2b4d3ee455e.tar.gz
gcc-8b46837cd1feb7d5f9d7c01b28ddb2b4d3ee455e.tar.bz2
re PR middle-end/35099 (ICE in remove_unreachable_regions with -O -fopenmp)
PR middle-end/35099 * tree-cfg.c (new_label_mapper): Update cfun->last_label_uid. * g++.dg/gomp/pr35099.C: New test. From-SVN: r133084
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/gomp/pr35099.C39
-rw-r--r--gcc/tree-cfg.c2
4 files changed, 51 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d3ba56..f6d48e7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-10 Jakub Jelinek <jakub@redhat.com>
+
+ PR middle-end/35099
+ * tree-cfg.c (new_label_mapper): Update cfun->last_label_uid.
+
2008-03-10 H.J. Lu <hongjiu.lu@intel.com>
PR tree-optimization/35494
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d4cb326..5cefdef 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-10 Jakub Jelinek <jakub@redhat.com>
+
+ PR middle-end/35099
+ * g++.dg/gomp/pr35099.C: New test.
+
2008-03-10 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/range_check2.adb: New test.
diff --git a/gcc/testsuite/g++.dg/gomp/pr35099.C b/gcc/testsuite/g++.dg/gomp/pr35099.C
new file mode 100644
index 0000000..6c793a3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr35099.C
@@ -0,0 +1,39 @@
+// PR middle-end/35099
+// { dg-do compile }
+// { dg-options "-O2 -fopenmp" }
+
+struct A
+{
+ ~A () throw ();
+ void foo ();
+};
+
+struct B
+{
+ B () { A ().foo (); }
+};
+
+void
+bar ()
+{
+#pragma omp parallel
+ {
+ #pragma omp single
+ B ();
+ #pragma omp for
+ for (int i = 0; i < 2; ++i)
+ B ();
+ }
+}
+
+void
+baz ()
+{
+#pragma omp parallel
+ {
+ #pragma omp single
+ B ();
+ #pragma omp single
+ B ();
+ }
+}
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index f98c684..5e551aa 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -5895,6 +5895,8 @@ new_label_mapper (tree decl, void *data)
m->base.from = decl;
m->to = create_artificial_label ();
LABEL_DECL_UID (m->to) = LABEL_DECL_UID (decl);
+ if (LABEL_DECL_UID (m->to) >= cfun->last_label_uid)
+ cfun->last_label_uid = LABEL_DECL_UID (m->to) + 1;
slot = htab_find_slot_with_hash (hash, m, m->hash, INSERT);
gcc_assert (*slot == NULL);