[Patch] Fortran/OpenMP: Fix var-list expr parsing with array/dt (was: [Patch] OpenMP: Add iterator support to Fortran's depend; add affinity clause)

[Tobias Burnus <tobias@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 980 bytes --]

On 28.04.21 15:41, Jakub Jelinek wrote:
>> @@ -261,6 +263,7 @@ gfc_match_omp_variable_list (const char *str, gfc_omp_namelist **list,
>> +      gfc_gobble_whitespace ();
>>        if ((allow_sections && gfc_peek_ascii_char () == '(')
>>            || (allow_derived && gfc_peek_ascii_char () == '%')
> Is this change specific to depend/affinity or iterators?
> If not, shouldn't it go in separately and with a testcase that shows when it
> is needed?

I encountered it when writing a testcase - and the testcase was using it.
However, if you think it makes sense to have it separately.

It fixes the issue:

     7 | !$omp target enter data map( to: a (:) )
       |                                   1
Error: Syntax error in OpenMP variable list at (1)

OK for mainline?

Tobias

-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstrasse 201, 80634 München Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Frank Thürauf

[-- Attachment #2: var-space.diff --]
[-- Type: text/x-patch, Size: 1385 bytes --]

Fortran/OpenMP: Fix var-list expr parsing with array/dt

gcc/fortran/ChangeLog:

	* openmp.c (gfc_match_omp_variable_list): Gobble whitespace before
	checking whether a '%' or '(' follows as next character.

gcc/testsuite/ChangeLog:

	* gfortran.dg/gomp/map-5.f90: New test.

 gcc/fortran/openmp.c                     |  1 +
 gcc/testsuite/gfortran.dg/gomp/map-5.f90 | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index a1b057227b7..7eeabff8e76 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -261,6 +261,7 @@ gfc_match_omp_variable_list (const char *str, gfc_omp_namelist **list,
 	case MATCH_YES:
 	  gfc_expr *expr;
 	  expr = NULL;
+	  gfc_gobble_whitespace ();
 	  if ((allow_sections && gfc_peek_ascii_char () == '(')
 	      || (allow_derived && gfc_peek_ascii_char () == '%'))
 	    {
diff --git a/gcc/testsuite/gfortran.dg/gomp/map-5.f90 b/gcc/testsuite/gfortran.dg/gomp/map-5.f90
new file mode 100644
index 00000000000..2b4b341bc51
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/map-5.f90
@@ -0,0 +1,13 @@
+implicit none
+type t
+  integer :: b(5)
+end type t
+integer :: a(5), x, y(5)
+type(t) :: b
+!$omp target enter data map( to: a (:) )
+!$omp target enter data map( to: b % b )
+!$omp target enter data map( to: a(:) )
+!$omp target depend(out: y (2)) nowait
+!$omp end target
+
+end