re PR middle-end/33333 (ICE with #pragma omp parallel for in try/catch statement)

	PR middle-end/33333
	* gimplify.c (gimplify_omp_for): Gimplify OMP_FOR_PRE_BODY.

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

From-SVN: r131820

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 392999fa36f6dfb7a9da2315061ec2996d76773c..5b208cbf9fbe472e8200e8508869743f00a675f7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-25  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/33333
+       * gimplify.c (gimplify_omp_for): Gimplify OMP_FOR_PRE_BODY.
+
 2008-01-25  Golovanevsky Olga  <olga@il.ibm.com>
 
        * ipa-struct-reorg.c (remove_str_allocs_in_func, remove_str_allocs):

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 1075d6544275c2d76f16b45d44f85a2ba52f5608..fe708471944b1e200f1b5341cf580dbb89881371 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -5330,6 +5330,10 @@ gimplify_omp_for (tree *expr_p, tree *pre_p)
   else
     var = decl;
 
+  /* If OMP_FOR is re-gimplified, ensure all variables in pre-body
+     are noticed.  */
+  gimplify_stmt (&OMP_FOR_PRE_BODY (for_stmt));
+
   ret |= gimplify_expr (&GENERIC_TREE_OPERAND (t, 1),
                        &OMP_FOR_PRE_BODY (for_stmt),
                        NULL, is_gimple_val, fb_rvalue);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a722cb3b30912417864ea4343bb9c822baeb509e..392f7a5993b207cceaa596a59cf5fc9d221ea642 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2008-01-25  Jakub Jelinek  <jakub@redhat.com>
 
+       PR middle-end/33333
+       * g++.dg/gomp/pr33333.C: New test.
+
        PR preprocessor/34692
        * gcc.dg/cpp/pr34692.c: New test.
        * gcc.dg/gomp/pr34692.c: New test.

diff --git a/gcc/testsuite/g++.dg/gomp/pr33333.C b/gcc/testsuite/g++.dg/gomp/pr33333.C
new file mode 100644 (file)
index 0000000..ea5079b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr33333.C
@@ -0,0 +1,19 @@
+// PR middle-end/33333
+// { dg-do compile }
+
+struct A
+{
+  int n;
+  void foo ();
+};
+
+void
+A::foo ()
+{
+  try
+  {
+    #pragma omp parallel for
+      for (int i = 0; i < n; ++i)
+       ;
+  } catch (...) {}
+}