OpenMP/Fortran: Combined directives with map/firstprivate of same symbol
authorJulian Brown <julian@codesourcery.com>
Tue, 6 Dec 2022 12:18:33 +0000 (12:18 +0000)
committerJulian Brown <julian@codesourcery.com>
Wed, 14 Dec 2022 14:11:45 +0000 (14:11 +0000)
commit9316ad3b4354cbf2980f86902e54884e918c472a
treecb5a59f6ed70616e18e38d1036166ffa79b5283e
parent881c6cabce5d0b27285ed41bd6dabdf48848cce7
OpenMP/Fortran: Combined directives with map/firstprivate of same symbol

This patch fixes a case where a combined directive (e.g. "!$omp target
parallel ...") contains both a map and a firstprivate clause for the
same variable.  When the combined directive is split into two nested
directives, the outer "target" gets the "map" clause, and the inner
"parallel" gets the "firstprivate" clause, like so:

  !$omp target parallel map(x) firstprivate(x)

  -->

  !$omp target map(x)
    !$omp parallel firstprivate(x)
      ...

When there is no map of the same variable, the firstprivate is distributed
to both directives, e.g. for 'y' in:

  !$omp target parallel map(x) firstprivate(y)

  -->

  !$omp target map(x) firstprivate(y)
    !$omp parallel firstprivate(y)
      ...

This is not a recent regression, but appear to fix a long-standing ICE.
(The included testcase is based on one by Tobias.)

2022-12-06  Julian Brown  <julian@codesourcery.com>

gcc/fortran/
* trans-openmp.cc (gfc_add_firstprivate_if_unmapped): New function.
(gfc_split_omp_clauses): Call above.

libgomp/
* testsuite/libgomp.fortran/combined-directive-splitting-1.f90: New
test.
gcc/fortran/trans-openmp.cc
libgomp/testsuite/libgomp.fortran/combined-directive-splitting-1.f90 [new file with mode: 0644]