diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2020-01-22 09:54:59 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2020-01-22 09:54:59 +0100 |
| commit | 44a9d801a7080d39658754ad603536da6cff2cd0 (patch) | |
| tree | 617e098fd0dca82af8e90aef29025792bb7f3424 /gcc | |
| parent | a38979d9d7a4ab08336436052704028c56187618 (diff) | |
| download | gcc-44a9d801a7080d39658754ad603536da6cff2cd0.zip gcc-44a9d801a7080d39658754ad603536da6cff2cd0.tar.gz gcc-44a9d801a7080d39658754ad603536da6cff2cd0.tar.bz2 | |
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 <jakub@redhat.com>
* parse.c (parse_omp_structured_block): Handle ST_OMP_TARGET_PARALLEL.
* trans-openmp.c (gfc_trans_omp_target)
<case EXEC_OMP_TARGET_PARALLEL>: Call pushlevel first.
* gfortran.dg/gomp/target-parallel1.f90: New test.
* gfortran.dg/goacc/pr93329.f90: Enable commented out target parallel
test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/parse.c | 3 | ||||
| -rw-r--r-- | gcc/fortran/trans-openmp.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/goacc/pr93329.f90 | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/target-parallel1.f90 | 4 |
8 files changed, 20 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 223f52d..d338a4a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -13,7 +13,6 @@ <case SYMBOL_SMALL_TLSGD>: Call gen_tlsgd_small_* with a ptr_mode register. Convert that register back to dest using convert_mode. - 2020-01-21 Jim Wilson <jimw@sifive.com> * config/riscv/riscv-sr.c (riscv_sr_match_prologue): Use INTVAL diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4c195c4..1609344 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,10 +1,10 @@ -2020-01-22 Jun Ma <JunMa@linux.alibaba.com> +2020-01-22 Jun Ma <JunMa@linux.alibaba.com> * coroutines.cc (finish_co_await_expr): Add error check on return value of build_co_await. (finish_co_yield_expr,): Ditto. -2020-01-22 Jun Ma <JunMa@linux.alibaba.com> +2020-01-22 Jun Ma <JunMa@linux.alibaba.com> * coroutines.cc (lookup_awaitable_member): Lookup an awaitable member. (lookup_promise_method): Emit diagnostic when get NULL_TREE back only. diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 031c75b..ceefdf8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,9 @@ 2020-01-22 Jakub Jelinek <jakub@redhat.com> + * parse.c (parse_omp_structured_block): Handle ST_OMP_TARGET_PARALLEL. + * trans-openmp.c (gfc_trans_omp_target) + <case EXEC_OMP_TARGET_PARALLEL>: Call pushlevel first. + PR fortran/93329 * openmp.c (omp_code_to_statement): Handle remaining EXEC_OMP_* cases. diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 68cd58e..4bff0c8 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -5231,6 +5231,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 9835d2a..fd60bbb 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -5357,6 +5357,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 0c04921..552270d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2020-01-22 Jakub Jelinek <jakub@redhat.com> + * gfortran.dg/gomp/target-parallel1.f90: New test. + * gfortran.dg/goacc/pr93329.f90: Enable commented out target parallel + test. + PR fortran/93329 * gfortran.dg/goacc/pr93329.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/goacc/pr93329.f90 b/gcc/testsuite/gfortran.dg/goacc/pr93329.f90 index aed264a..b2d25bd 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 0000000..bb8561f --- /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 |