[C/C++, OpenACC] Reject vars of different scope in acc declare (PR94120)

	gcc/c/
	PR middle-end/94120
	* c-decl.c (c_check_in_current_scope): New function.
	* c-tree.h (c_check_in_current_scope): Declare it.
	* c-parser.c (c_parser_oacc_declare): Add check that variables
	are declared in the same scope as the directive. Fix handling
	of namespace vars.

	gcc/cp/
	PR middle-end/94120
	* paser.c (cp_parser_oacc_declare): Add check that variables
	are declared in the same scope as the directive.

	gcc/testsuite/
	PR middle-end/94120
	* c-c++-common/goacc/declare-pr94120.c: New.
	* g++.dg/declare-pr94120.C: New.

	libgomp/testsuite/
	PR middle-end/94120
	* libgomp.oacc-c++/declare-pr94120.C: New.

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index d30d2b02b2e2b77b1fa1a2f438c9d47d00ab4953..482a01b307a0ea94d378bd38b8ab141b85afc252 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,12 @@
+2020-04-08  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR middle-end/94120
+       * c-decl.c (c_check_in_current_scope): New function.
+       * c-tree.h (c_check_in_current_scope): Declare it.
+       * c-parser.c (c_parser_oacc_declare): Add check that variables
+       are declared in the same scope as the directive. Fix handling
+       of namespace vars.
+
 2020-04-07  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/94512

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index b31d99fcfafb0ac79969427241661516c1f41f13..0b7f4376dd350faac04a209e742ef755a37094c7 100644 (file)
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -12041,4 +12041,12 @@ c_check_omp_declare_reduction_r (tree *tp, int *, void *data)
   return NULL_TREE;
 }
 
+
+bool
+c_check_in_current_scope (tree decl)
+{
+  struct c_binding *b = I_SYMBOL_BINDING (DECL_NAME (decl));
+  return b != NULL && B_IN_CURRENT_SCOPE (b);
+}
+
 #include "gt-c-c-decl.h"

diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 17a28e97ca0e3d81248fab9e818e5adfd5644e5b..d1c954cd02a4efcbb9afd7034750ddb62aaf740f 100644 (file)
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -16580,6 +16580,15 @@ c_parser_oacc_declare (c_parser *parser)
          break;
        }
 
+      if (!c_check_in_current_scope (decl))
+       {
+         error_at (loc,
+                   "%qD must be a variable declared in the same scope as "
+                   "%<#pragma acc declare%>", decl);
+         error = true;
+         continue;
+       }
+
       if (lookup_attribute ("omp declare target", DECL_ATTRIBUTES (decl))
          || lookup_attribute ("omp declare target link",
                               DECL_ATTRIBUTES (decl)))

diff --git a/gcc/c/c-tree.h b/gcc/c/c-tree.h
index 2015827dbb1589e48fa26737e68a40b195befb80..94668866fa215cc4483a4cac17d82277827fbba6 100644 (file)
--- a/gcc/c/c-tree.h
+++ b/gcc/c/c-tree.h
@@ -793,6 +793,7 @@ extern tree c_omp_reduction_id (enum tree_code, tree);
 extern tree c_omp_reduction_decl (tree);
 extern tree c_omp_reduction_lookup (tree, tree);
 extern tree c_check_omp_declare_reduction_r (tree *, int *, void *);
+extern bool c_check_in_current_scope (tree);
 extern void c_pushtag (location_t, tree, tree);
 extern void c_bind (location_t, tree, bool);
 extern bool tag_exists_p (enum tree_code, tree);

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 31f1fc433fdf08ba5093295a21c511e9e912b8b5..561eb4e76f40e48be5da4ae69f729866dc0c3438 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-08  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR middle-end/94120
+       * paser.c (cp_parser_oacc_declare): Add check that variables
+       are declared in the same scope as the directive.
+
 2020-04-07  Jason Merrill  <jason@redhat.com>
 
        PR c++/94480

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index a95d43127d72b5d57a802df6bb17e44f1b48633e..fec5203830ae01867305f3eb5f3fb322cbd29bab 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -40906,6 +40906,7 @@ cp_parser_oacc_declare (cp_parser *parser, cp_token *pragma_tok)
 {
   tree clauses, stmt;
   bool error = false;
+  bool found_in_scope = global_bindings_p ();
 
   clauses = cp_parser_oacc_all_clauses (parser, OACC_DECLARE_CLAUSE_MASK,
                                        "#pragma acc declare", pragma_tok, true);
@@ -40978,6 +40979,22 @@ cp_parser_oacc_declare (cp_parser *parser, cp_token *pragma_tok)
          break;
        }
 
+      if (!found_in_scope)
+       for (tree d = current_binding_level->names; d; d = TREE_CHAIN (d))
+         if (d == decl)
+           {
+             found_in_scope = true;
+             break;
+           }
+      if (!found_in_scope)
+       {
+         error_at (loc,
+                   "%qD must be a variable declared in the same scope as "
+                   "%<#pragma acc declare%>", decl);
+         error = true;
+         continue;
+       }
+
       if (lookup_attribute ("omp declare target", DECL_ATTRIBUTES (decl))
          || lookup_attribute ("omp declare target link",
                               DECL_ATTRIBUTES (decl)))
@@ -40999,7 +41016,7 @@ cp_parser_oacc_declare (cp_parser *parser, cp_token *pragma_tok)
 
          DECL_ATTRIBUTES (decl)
            = tree_cons (id, NULL_TREE, DECL_ATTRIBUTES (decl));
-         if (global_bindings_p ())
+         if (current_binding_level->kind == sk_namespace)
            {
              symtab_node *node = symtab_node::get (decl);
              if (node != NULL)
@@ -41016,7 +41033,7 @@ cp_parser_oacc_declare (cp_parser *parser, cp_token *pragma_tok)
        }
     }
 
-  if (error || global_bindings_p ())
+  if (error || current_binding_level->kind == sk_namespace)
     return NULL_TREE;
 
   stmt = make_node (OACC_DECLARE);

diff --git a/gcc/omp-grid.c b/gcc/omp-grid.c
index b98e45de6a0e4c2273dce01896173cae2df89137..ba635fd3ea2a33ae1560ef5589aee2463e14c21e 100644 (file)
--- a/gcc/omp-grid.c
+++ b/gcc/omp-grid.c
@@ -1065,7 +1065,7 @@ grid_eliminate_combined_simd_part (gomp_for *parloop)
   while (*pc)
     {
       tree c = *pc;
-      switch (TREE_CODE (c))
+      switch (OMP_CLAUSE_CODE (c))
        {
        case OMP_CLAUSE_LINEAR:
          {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3cbf891d58d168c14d72f14cd4a94ca646f92755..e4e6ecf67860f1003ada9e969e72390620660677 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-08  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR middle-end/94120
+       * c-c++-common/goacc/declare-pr94120.c: New.
+       * g++.dg/declare-pr94120.C: New.
+
 2020-04-07  Jakub Jelinek  <jakub@redhat.com>
 
        PR rtl-optimization/94291

diff --git a/gcc/testsuite/c-c++-common/goacc/declare-pr94120.c b/gcc/testsuite/c-c++-common/goacc/declare-pr94120.c
new file mode 100644 (file)
index 0000000..21b2cc1
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/goacc/declare-pr94120.c
@@ -0,0 +1,23 @@
+/* { dg-do compile }  */
+
+/* PR middle-end/94120  */
+
+void foo()
+{
+  int foo;
+  {
+    #pragma acc declare copy(foo)  /* { dg-error "'foo' must be a variable declared in the same scope as '#pragma acc declare'" }  */
+  }
+}
+
+void
+f_data (void)
+{
+  int B[10];
+#pragma acc data
+  {
+# pragma acc declare copy(B)  /* { dg-error "'B' must be a variable declared in the same scope as '#pragma acc declare'" }  */
+    for (int i = 0; i < 10; i++)
+      B[i] = -i;
+  }
+}

diff --git a/gcc/testsuite/g++.dg/declare-pr94120.C b/gcc/testsuite/g++.dg/declare-pr94120.C
new file mode 100644 (file)
index 0000000..8515c4f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/declare-pr94120.C
@@ -0,0 +1,30 @@
+/* { dg-do compile }  */
+
+/* PR middle-end/94120  */
+
+int b[8];
+#pragma acc declare create (b)
+ 
+namespace my {
+ int d[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
+ #pragma acc declare copyin (d)
+};
+
+namespace outer {
+  namespace inner {
+    int e[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
+    #pragma acc declare copyin (e)
+  };
+};
+
+int f[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
+namespace my {
+ #pragma acc declare copyin (f)
+};
+
+namespace outer {
+  int g[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
+  namespace inner {
+    #pragma acc declare copyin (g)
+  };
+};

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 6f7327ab4a757299e6d8c2ebbd49d6975be9f71c..0e4958f0c6747bd65cd7f5a34fd346738d9deca6 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-08  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR middle-end/94120
+       * libgomp.oacc-c++/declare-pr94120.C: New.
+
 2020-04-06  Maciej W. Rozycki  <macro@wdc.com>
 
        * configure.ac: Add testsuite/libgomp-site-extra.exp to output

diff --git a/libgomp/testsuite/libgomp.oacc-c++/declare-pr94120.C b/libgomp/testsuite/libgomp.oacc-c++/declare-pr94120.C
new file mode 100644 (file)
index 0000000..1e12541
--- /dev/null
+++ b/libgomp/testsuite/libgomp.oacc-c++/declare-pr94120.C
@@ -0,0 +1,57 @@
+#include <openacc.h>
+#include <stdlib.h>
+
+#define N 8
+
+namespace one {
+  int A[N] = { 1, 2, 3, 4, 5, 6, 7, 8 };
+  #pragma acc declare copyin (A)
+};
+
+namespace outer {
+  namespace inner {
+    int B[N];
+    #pragma acc declare create (B)
+  };
+};
+
+static void
+f (void)
+{
+  int i;
+  int C[N];
+  #pragma acc declare copyout (C)
+
+  if (!acc_is_present (&one::A, sizeof (one::A)))
+    abort ();
+
+  if (!acc_is_present (&outer::inner::B, sizeof (outer::inner::B)))
+    abort ();
+
+#pragma acc parallel
+  for (i = 0; i < N; i++)
+    {
+      outer::inner::B[i] = one::A[i];
+      C[i] = outer::inner::B[i];
+    }
+
+  for (i = 0; i < N; i++)
+    {
+      if (C[i] != i + 1)
+       abort ();
+    }
+
+#pragma acc parallel
+  for (i = 0; i < N; i++)
+    if (outer::inner::B[i] != i + 1)
+      abort ();
+}
+
+
+int
+main (int argc, char **argv)
+{
+  f ();
+
+  return 0;
+}