re PR middle-end/32362 (ICE: in lookup_decl_in_outer_ctx, at omp-low.c:1508)

	PR middle-end/32362
	* omp-low.c (lookup_decl_in_outer_ctx): Don't ICE if t is NULL,
	but decl is a global var, instead return decl.
	* gimplify.c (gimplify_adjust_omp_clauses_1): Add shared clauses
	even for is_global_var decls, if they are private in some outer
	context.

	* testsuite/libgomp.c/pr32362-1.c: New test.
	* testsuite/libgomp.c/pr32362-2.c: New test.
	* testsuite/libgomp.c/pr32362-3.c: New test.

From-SVN: r125917

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 90c40a20954b0a8b959529e1bcb44f8494a11b19..cabe8b941faf86707095f4d7ea7d4f665de60888 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-21  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/32362
+       * omp-low.c (lookup_decl_in_outer_ctx): Don't ICE if t is NULL,
+       but decl is a global var, instead return decl.
+       * gimplify.c (gimplify_adjust_omp_clauses_1): Add shared clauses
+       even for is_global_var decls, if they are private in some outer
+       context.
+
 2007-06-21  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/32451

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 01ccaf02a823a3adf1cd03d96181858caac9c7da..c93bb4449d5b1f14363259fdf848e5988d074603 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -4882,7 +4882,20 @@ gimplify_adjust_omp_clauses_1 (splay_tree_node n, void *data)
   else if (flags & GOVD_SHARED)
     {
       if (is_global_var (decl))
-       return 0;
+       {
+         struct gimplify_omp_ctx *ctx = gimplify_omp_ctxp->outer_context;
+         while (ctx != NULL)
+           {
+             splay_tree_node on
+               = splay_tree_lookup (ctx->variables, (splay_tree_key) decl);
+             if (on && (on->value & (GOVD_FIRSTPRIVATE | GOVD_LASTPRIVATE
+                                     | GOVD_PRIVATE | GOVD_REDUCTION)) != 0)
+               break;
+             ctx = ctx->outer_context;
+           }
+         if (ctx == NULL)
+           return 0;
+       }
       code = OMP_CLAUSE_SHARED;
     }
   else if (flags & GOVD_PRIVATE)

diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 5b1f3c4c3d8c1c2131a3415d643e51c391fb477e..700645f6551dd39d4dbd5f7d45f60a107dc4009b 100644 (file)
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -1504,9 +1504,9 @@ lookup_decl_in_outer_ctx (tree decl, omp_context *ctx)
   for (up = ctx->outer, t = NULL; up && t == NULL; up = up->outer)
     t = maybe_lookup_decl (decl, up);
 
-  gcc_assert (t);
+  gcc_assert (t || is_global_var (decl));
 
-  return t;
+  return t ? t : decl;
 }
 
 

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 83c841c51250adce3d8208988356cbf527161af0..a4abc445a8795464ebcfab192b340ba02fb785c6 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-21  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/32362
+       * testsuite/libgomp.c/pr32362-1.c: New test.
+       * testsuite/libgomp.c/pr32362-2.c: New test.
+       * testsuite/libgomp.c/pr32362-3.c: New test.
+
 2007-06-07  Jakub Jelinek  <jakub@redhat.com>
 
        * team.c (gomp_team_start): Fix setting up thread_attr

diff --git a/libgomp/testsuite/libgomp.c/pr32362-1.c b/libgomp/testsuite/libgomp.c/pr32362-1.c
new file mode 100644 (file)
index 0000000..3c62d4b
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/pr32362-1.c
@@ -0,0 +1,32 @@
+/* PR middle-end/32362 */
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+#include <omp.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int n[4] = { -1, -1, -1, -1 };
+  static int a = 2, b = 4;
+  omp_set_num_threads (4);
+  omp_set_dynamic (0);
+  omp_set_nested (1);
+#pragma omp parallel private(b)
+  {
+    b = omp_get_thread_num ();
+#pragma omp parallel firstprivate(a)
+    {
+      a = (omp_get_thread_num () + a) + 1;
+      if (b == omp_get_thread_num ())
+       n[omp_get_thread_num ()] = a + (b << 4);
+    }
+  }
+  if (n[0] != 3)
+    abort ();
+  if (n[3] != -1
+      && (n[1] != 0x14 || n[2] != 0x25 || n[3] != 0x36))
+    abort ();
+  return 0;
+}

diff --git a/libgomp/testsuite/libgomp.c/pr32362-2.c b/libgomp/testsuite/libgomp.c/pr32362-2.c
new file mode 100644 (file)
index 0000000..43f36e0
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/pr32362-2.c
@@ -0,0 +1,33 @@
+/* PR middle-end/32362 */
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+#include <omp.h>
+#include <stdlib.h>
+
+int a = 2, b = 4;
+
+int
+main ()
+{
+  int n[4] = { -1, -1, -1, -1 };
+  omp_set_num_threads (4);
+  omp_set_dynamic (0);
+  omp_set_nested (1);
+#pragma omp parallel private(b)
+  {
+    b = omp_get_thread_num ();
+#pragma omp parallel firstprivate(a)
+    {
+      a = (omp_get_thread_num () + a) + 1;
+      if (b == omp_get_thread_num ())
+       n[omp_get_thread_num ()] = a + (b << 4);
+    }
+  }
+  if (n[0] != 3)
+    abort ();
+  if (n[3] != -1
+      && (n[1] != 0x14 || n[2] != 0x25 || n[3] != 0x36))
+    abort ();
+  return 0;
+}

diff --git a/libgomp/testsuite/libgomp.c/pr32362-3.c b/libgomp/testsuite/libgomp.c/pr32362-3.c
new file mode 100644 (file)
index 0000000..09a88f5
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/pr32362-3.c
@@ -0,0 +1,34 @@
+/* PR middle-end/32362 */
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+#include <omp.h>
+#include <stdlib.h>
+
+int a = 2;
+
+int
+main ()
+{
+  int n[4] = { -1, -1, -1, -1 };
+  int b = 4;
+  omp_set_num_threads (4);
+  omp_set_dynamic (0);
+  omp_set_nested (1);
+#pragma omp parallel private(b)
+  {
+    b = omp_get_thread_num ();
+#pragma omp parallel firstprivate(a)
+    {
+      a = (omp_get_thread_num () + a) + 1;
+      if (b == omp_get_thread_num ())
+       n[omp_get_thread_num ()] = a + (b << 4);
+    }
+  }
+  if (n[0] != 3)
+    abort ();
+  if (n[3] != -1
+      && (n[1] != 0x14 || n[2] != 0x25 || n[3] != 0x36))
+    abort ();
+  return 0;
+}