This fixes the validation of the argument to the deviceptr clause.
Bootstrapped and regtested on x86_64-unknown-linux-gnu.
OK to commit to trunk?
Jim
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index ceb9e1a..9f0d7af 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -10334,11 +10334,11 @@ c_parser_oacc_data_clause_deviceptr (c_parser *parser, tree list)
c_parser_omp_var_list_parens() should construct a list of
locations to go along with the var list. */
- if (TREE_CODE (v) != VAR_DECL)
- error_at (loc, "%qD is not a variable", v);
- else if (TREE_TYPE (v) == error_mark_node)
+ if (TREE_TYPE (v) == error_mark_node)
;
- else if (!POINTER_TYPE_P (TREE_TYPE (v)))
+ else if ((TREE_CODE (v) != VAR_DECL ||
+ TREE_CODE (v) != PARM_DECL) &&
+ !POINTER_TYPE_P (TREE_TYPE (v)))
error_at (loc, "%qD is not a pointer variable", v);
tree u = build_omp_clause (loc, OMP_CLAUSE_MAP);
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 57dfbcc..37b4712 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -27988,11 +27988,11 @@ cp_parser_oacc_data_clause_deviceptr (cp_parser *parser, tree list)
c_parser_omp_var_list_parens should construct a list of
locations to go along with the var list. */
- if (TREE_CODE (v) != VAR_DECL)
- error_at (loc, "%qD is not a variable", v);
- else if (TREE_TYPE (v) == error_mark_node)
+ if (TREE_TYPE (v) == error_mark_node)
;
- else if (!POINTER_TYPE_P (TREE_TYPE (v)))
+ else if ((TREE_CODE (v) != VAR_DECL ||
+ TREE_CODE (v) != PARM_DECL) &&
+ !POINTER_TYPE_P (TREE_TYPE (v)))
error_at (loc, "%qD is not a pointer variable", v);
tree u = build_omp_clause (loc, OMP_CLAUSE_MAP);
diff --git a/gcc/testsuite/c-c++-common/goacc/deviceptr-1.c b/gcc/testsuite/c-c++-common/goacc/deviceptr-1.c
index 546fa82..5ec7540 100644
--- a/gcc/testsuite/c-c++-common/goacc/deviceptr-1.c
+++ b/gcc/testsuite/c-c++-common/goacc/deviceptr-1.c
@@ -8,27 +8,29 @@ fun1 (void)
#pragma acc kernels deviceptr(u[0:4]) /* { dg-error "expected '\\\)' before '\\\[' token" } */
;
-#pragma acc data deviceptr(fun1) /* { dg-error "'fun1' is not a variable" } */
+#pragma acc data deviceptr(fun1) /* { dg-error "'fun1' is not a pointer variable" } */
+ /* { dg-error "'fun1' is not a variable in 'map' clause" "fun1 is not a varialbe in map clause" { target *-*-* } 11 } */
;
#pragma acc parallel deviceptr(fun1[2:5])
- /* { dg-error "'fun1' is not a variable" "not a variable" { target *-*-* } 13 } */
- /* { dg-error "expected '\\\)' before '\\\[' token" "array" { target *-*-* } 13 } */
+ /* { dg-error "'fun1' is not a pointer variable" "not a pointer variable" { target *-*-* } 14 } */
+ /* { dg-error "expected '\\\)' before '\\\[' token" "array" { target *-*-* } 14 } */
+ /* { dg-error "'fun1' is not a variable in 'map' clause" "fun1 is not a varialbe in map clause" { target *-*-* } 14 } */
;
int i;
#pragma acc kernels deviceptr(i) /* { dg-error "'i' is not a pointer variable" } */
;
#pragma acc data deviceptr(i[0:4])
- /* { dg-error "'i' is not a pointer variable" "not a pointer variable" { target *-*-* } 21 } */
- /* { dg-error "expected '\\\)' before '\\\[' token" "array" { target *-*-* } 21 } */
+ /* { dg-error "'i' is not a pointer variable" "not a pointer variable" { target *-*-* } 23 } */
+ /* { dg-error "expected '\\\)' before '\\\[' token" "array" { target *-*-* } 23 } */
;
float fa[10];
#pragma acc parallel deviceptr(fa) /* { dg-error "'fa' is not a pointer variable" } */
;
#pragma acc kernels deviceptr(fa[1:5])
- /* { dg-error "'fa' is not a pointer variable" "not a pointer variable" { target *-*-* } 29 } */
- /* { dg-error "expected '\\\)' before '\\\[' token" "array" { target *-*-* } 29 } */
+ /* { dg-error "'fa' is not a pointer variable" "not a pointer variable" { target *-*-* } 31 } */
+ /* { dg-error "expected '\\\)' before '\\\[' token" "array" { target *-*-* } 31 } */
;
float *fp;
@@ -44,10 +46,11 @@ fun2 (void)
int i;
float *fp;
#pragma acc kernels deviceptr(fp,u,fun2,i,fp)
- /* { dg-error "'u' undeclared" "u undeclared" { target *-*-* } 46 } */
- /* { dg-error "'fun2' is not a variable" "fun2 not a variable" { target *-*-* } 46 } */
- /* { dg-error "'i' is not a pointer variable" "i not a pointer variable" { target *-*-* } 46 } */
- /* { dg-error "'fp' appears more than once in map clauses" "fp more than once" { target *-*-* } 46 } */
+ /* { dg-error "'u' undeclared" "u undeclared" { target *-*-* } 48 } */
+ /* { dg-error "'fun2' is not a pointer variable" "fun2 not a pointer variable" { target *-*-* } 48 } */
+ /* { dg-error "'i' is not a pointer variable" "i not a pointer variable" { target *-*-* } 48 } */
+ /* { dg-error "'fp' appears more than once in map clauses" "fp more than once" { target *-*-* } 48 } */
+ /* { dg-error "'fun2' is not a variable in 'map' clause" "fun2 is not a variable in map clause" { target *-*-* } 48 } */
;
}
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/deviceptr-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/deviceptr-1.c
index e271a37..5443433 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/deviceptr-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/deviceptr-1.c
@@ -1,10 +1,26 @@
/* { dg-do run } */
+#include <string.h>
#include <stdlib.h>
+#include <openacc.h>
+
+void foo (int *b, const int N)
+{
+ int i;
+
+#pragma acc parallel loop deviceptr (b)
+ for (i = 0; i < N; i++)
+ b[i] = i;
+
+ return;
+}
int main (void)
{
void *a, *a_1, *a_2;
+ int *b;
+ const int N = 32;
+ int i;
#define A (void *) 0x123
a = A;
@@ -28,5 +44,35 @@ int main (void)
abort ();
#endif
+#if !ACC_MEM_SHARED
+ b = (int *) malloc (N * sizeof (int));
+
+ memset (b, 0, (N * sizeof (int)));
+
+#pragma acc data copy (b[0:N])
+ {
+#pragma acc parallel loop deviceptr (b)
+ for (i = 0; i < N; i++)
+ b[i] = i;
+ }
+
+ for (i = 0; i < N; i++)
+ {
+ if (b[i] != i)
+ abort ();
+ }
+
+#pragma acc data copy (b[0:N])
+ {
+ foo ((int *) acc_deviceptr (b), N);
+ }
+
+ for (i = 0; i < N; i++)
+ {
+ if (b[i] != i)
+ abort ();
+ }
+#endif
+
return 0;
}
