From 18cfaa4217fabce8df0f2aac5367bf4952a13f51 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 22 Jan 2020 18:07:03 +0100 Subject: [PATCH] openmp: Fix up !$omp target parallel handling The PR93329 fix revealed we ICE on !$omp target parallel, this change fixes that. 2020-01-22 Jakub Jelinek * parse.c (parse_omp_structured_block): Handle ST_OMP_TARGET_PARALLEL. * trans-openmp.c (gfc_trans_omp_target) : Call pushlevel first. * gfortran.dg/gomp/target-parallel1.f90: New test. * gfortran.dg/goacc/pr93329.f90: Enable commented out target parallel test. --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/parse.c | 3 +++ gcc/fortran/trans-openmp.c | 1 + gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/goacc/pr93329.f90 | 4 ++-- gcc/testsuite/gfortran.dg/gomp/target-parallel1.f90 | 4 ++++ 6 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/gomp/target-parallel1.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4d3bfa6d2f9d..d0d6fb57bb5d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2020-01-22 Jakub Jelinek + + * parse.c (parse_omp_structured_block): Handle ST_OMP_TARGET_PARALLEL. + * trans-openmp.c (gfc_trans_omp_target) + : Call pushlevel first. + 2020-01-22 Jakub Jelinek PR fortran/93329 diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 86af947d1525..9e662a661263 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -5103,6 +5103,9 @@ parse_omp_structured_block (gfc_statement omp_st, bool workshare_stmts_only) case ST_OMP_TARGET_DATA: omp_end_st = ST_OMP_END_TARGET_DATA; break; + case ST_OMP_TARGET_PARALLEL: + omp_end_st = ST_OMP_END_TARGET_PARALLEL; + break; case ST_OMP_TARGET_TEAMS: omp_end_st = ST_OMP_END_TARGET_TEAMS; break; diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index 98e3d58e174d..52a2cc8a4da9 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -4783,6 +4783,7 @@ gfc_trans_omp_target (gfc_code *code) { stmtblock_t iblock; + pushlevel (); gfc_start_block (&iblock); tree inner_clauses = gfc_trans_omp_clauses (&block, &clausesa[GFC_OMP_SPLIT_PARALLEL], diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b458451fa8d0..d0d8279ef197 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-01-22 Jakub Jelinek + + * gfortran.dg/gomp/target-parallel1.f90: New test. + * gfortran.dg/goacc/pr93329.f90: Enable commented out target parallel + test. + 2020-01-22 Jakub Jelinek PR fortran/93329 diff --git a/gcc/testsuite/gfortran.dg/goacc/pr93329.f90 b/gcc/testsuite/gfortran.dg/goacc/pr93329.f90 index e1feafd2ba2b..b277bb1243c9 100644 --- a/gcc/testsuite/gfortran.dg/goacc/pr93329.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/pr93329.f90 @@ -68,8 +68,8 @@ !$omp target exit data map(from: x) ! { dg-error "OMP TARGET EXIT DATA directive cannot be specified within" } !$acc end kernels !$acc kernels -!!$omp target parallel -!!$omp end target parallel +!$omp target parallel ! { dg-error "OMP TARGET PARALLEL directive cannot be specified within" } +!$omp end target parallel !$acc end kernels !$acc kernels !$omp target parallel do ! { dg-error "OMP TARGET PARALLEL DO directive cannot be specified within" } diff --git a/gcc/testsuite/gfortran.dg/gomp/target-parallel1.f90 b/gcc/testsuite/gfortran.dg/gomp/target-parallel1.f90 new file mode 100644 index 000000000000..bb8561f1c73a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/target-parallel1.f90 @@ -0,0 +1,4 @@ +!$omp target parallel + print *, 'Hello, world' +!$omp end target parallel +end -- 2.47.2