mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-23 15:01:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

openmp: Fix up !$omp target parallel handling

Browse Source 
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.
This commit is contained in:
Jakub Jelinek 2020-01-22 09:54:59 +01:00
parent a38979d9d7
commit 44a9d801a7
8 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gcc/ChangeLog
View File

@ -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

4
gcc/cp/ChangeLog
View File

@ -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.

4
gcc/fortran/ChangeLog
View File

@ -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.

3
gcc/fortran/parse.c
View File

@ -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;

1
gcc/fortran/trans-openmp.c
View File

@ -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],

4
gcc/testsuite/ChangeLog
View File

@ -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.

4
gcc/testsuite/gfortran.dg/goacc/pr93329.f90
View File

@ -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" }

4
gcc/testsuite/gfortran.dg/gomp/target-parallel1.f90 Normal file
View File

@ -0,0 +1,4 @@
!$omp target parallel
print *, 'Hello, world'
!$omp end target parallel
end