diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2020-08-04 14:42:26 +0200 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2020-08-04 14:42:26 +0200 |
| commit | 7bd72dd5a385dfa6d49cfe640cefc9ed187361d3 (patch) | |
| tree | 1139c4f27f43153f55ece7272f40694a1591624f /gcc | |
| parent | 7cda9e0878da44dcaf025d3d146534dfaf0b9986 (diff) | |
| download | gcc-7bd72dd5a385dfa6d49cfe640cefc9ed187361d3.zip gcc-7bd72dd5a385dfa6d49cfe640cefc9ed187361d3.tar.gz gcc-7bd72dd5a385dfa6d49cfe640cefc9ed187361d3.tar.bz2 | |
Fortran: Fix for OpenMP's 'lastprivate(conditional:'
gcc/fortran/ChangeLog:
* trans-openmp.c (gfc_trans_omp_do): Fix 'lastprivate(conditional:'.
gcc/testsuite/ChangeLog:
* gfortran.dg/gomp/lastprivate-conditional-3.f90: Enable some
previously disabled 'lastprivate(conditional:' dg-warnings.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/trans-openmp.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/lastprivate-conditional-3.f90 | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index 98702b1..7891a7e 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -4570,6 +4570,8 @@ gfc_trans_omp_do (gfc_code *code, gfc_exec_op op, stmtblock_t *pblock, { tree l = build_omp_clause (input_location, OMP_CLAUSE_LASTPRIVATE); + if (OMP_CLAUSE_LASTPRIVATE_CONDITIONAL (c)) + OMP_CLAUSE_LASTPRIVATE_CONDITIONAL (l) = 1; OMP_CLAUSE_DECL (l) = dovar_decl; OMP_CLAUSE_CHAIN (l) = omp_clauses; OMP_CLAUSE_LASTPRIVATE_STMT (l) = tmp; diff --git a/gcc/testsuite/gfortran.dg/gomp/lastprivate-conditional-3.f90 b/gcc/testsuite/gfortran.dg/gomp/lastprivate-conditional-3.f90 index 720fe9b..932249c 100644 --- a/gcc/testsuite/gfortran.dg/gomp/lastprivate-conditional-3.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/lastprivate-conditional-3.f90 @@ -27,14 +27,12 @@ subroutine foo end do !$omp end parallel - ! Error in eqiv. C code: "conditional 'lastprivate' on loop iterator 'i' ignored" - !$omp parallel do lastprivate (conditional: i) + !$omp parallel do lastprivate (conditional: i) ! { dg-warning "conditional 'lastprivate' on loop iterator 'i' ignored" } do i = 1, 32 end do !$omp end parallel do - ! Error in eqiv. C code: "conditional 'lastprivate' on loop iterator 'i' ignored" - !$omp parallel do collapse (3) lastprivate (conditional: i) + !$omp parallel do collapse (3) lastprivate (conditional: i) ! { dg-warning "conditional 'lastprivate' on loop iterator 'i' ignored" } do i = 1, 32 do j = 1, 32 do k = 1, 32 @@ -43,8 +41,7 @@ subroutine foo end do !$omp end parallel do - ! Error in eqiv. C code: "conditional 'lastprivate' on loop iterator 'j' ignored" - !$omp parallel do collapse (3) lastprivate (conditional: j) + !$omp parallel do collapse (3) lastprivate (conditional: j) ! { dg-warning "conditional 'lastprivate' on loop iterator 'j' ignored" } do i = 1, 32 do j = 1, 32 do k = 1, 32 @@ -53,8 +50,7 @@ subroutine foo end do !$omp end parallel do - ! Error in eqiv. C code: "conditional 'lastprivate' on loop iterator 'k' ignored" - !$omp parallel do collapse (3) lastprivate (conditional: k) + !$omp parallel do collapse (3) lastprivate (conditional: k) ! { dg-warning "conditional 'lastprivate' on loop iterator 'k' ignored" } do i = 1, 32 do j = 1, 32 do k = 1, 32 |