PR tree-optimization/30558

	* tree-eh.c (lower_eh_filter): If EH_FILTER_MUST_NOT_THROW
	clear this_state.prev_try.

	* g++.dg/gomp/pr30558.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124177 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ad1928a..b99d527 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-26  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/30558
+       * tree-eh.c (lower_eh_filter): If EH_FILTER_MUST_NOT_THROW
+       clear this_state.prev_try.
+
 2007-04-26  Richard Sandiford  <richard@codesourcery.com>
            Mark Mitchell  <mark@codesourcery.com>
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 04a98ad..d75284c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-26  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/30558
+       * g++.dg/gomp/pr30558.C: New test.
+
 2007-04-24  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/31338

diff --git a/gcc/testsuite/g++.dg/gomp/pr30558.C b/gcc/testsuite/g++.dg/gomp/pr30558.C
new file mode 100644 (file)
index 0000000..e492922
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr30558.C
@@ -0,0 +1,41 @@
+// PR tree-optimization/30558
+// { dg-do compile }
+// { dg-options "-fopenmp" }
+
+template <typename T> struct F
+{
+  ~F ();
+  F (T);
+  const T &operator[] (unsigned i) const;
+};
+
+template <typename T> F<T> foo (const F<T> &x)
+{
+  return F<T> (x[1]);
+}
+
+struct G
+{
+  G () { bar (2); }
+  F<int> &operator () (F<int> x);
+  void bar (int);
+};
+
+int
+main ()
+{
+  try
+  {
+    G g;
+#pragma omp parallel for
+    for (int i = 0; i < 10; ++i)
+      {
+       F<int> j (i);
+       F<int> f = g (j);
+       F<int> h = foo (f);
+      }
+  }
+  catch (int &e)
+  {
+  }
+}

diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index edd17cb..37fce85 100644 (file)
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -1497,6 +1497,10 @@ lower_eh_filter (struct leh_state *state, tree *tp)
                                         EH_FILTER_TYPES (inner));
   this_state = *state;
   this_state.cur_region = this_region;
+  /* For must not throw regions any cleanup regions inside it
+     can't reach outer catch regions.  */
+  if (EH_FILTER_MUST_NOT_THROW (inner))
+    this_state.prev_try = NULL;
 
   lower_eh_constructs_1 (&this_state, &TREE_OPERAND (*tp, 0));