diff options
| author | Cesar Philippidis <cesar@codesourcery.com> | 2018-06-13 07:31:17 -0700 |
|---|---|---|
| committer | Cesar Philippidis <cesar@gcc.gnu.org> | 2018-06-13 07:31:17 -0700 |
| commit | 0be606d3ce7b39148d0d0aed54bae3b4fe9478af (patch) | |
| tree | 541b70e1c266b2847191e307eb4153c3970d2883 /gcc | |
| parent | adc41ebeab0c027cce9e1fb1e1356a66d89aeb57 (diff) | |
| download | gcc-0be606d3ce7b39148d0d0aed54bae3b4fe9478af.zip gcc-0be606d3ce7b39148d0d0aed54bae3b4fe9478af.tar.gz gcc-0be606d3ce7b39148d0d0aed54bae3b4fe9478af.tar.bz2 | |
re PR fortran/85703 ([openacc] ICE in resolve_fntype, at fortran/resolve.c:16313)
PR fortran/85703
gcc/fortran/
* parse.c (decode_oacc_directive): Set gfc_matching_function
to false.
(decode_omp_directive): Likewise.
gcc/testsuite/
* gfortran.dg/goacc/pr85703.f90: New test.
* gfortran.dg/gomp/pr85703.f90: New test.
From-SVN: r261551
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/parse.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/goacc/pr85703.f90 | 9 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/pr85703.f90 | 8 |
5 files changed, 34 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9018933..25b5f37 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,12 @@ 2018-06-13 Cesar Philippidis <cesar@codesourcery.com> + PR fortran/85703 + * parse.c (decode_oacc_directive): Set gfc_matching_function + to false. + (decode_omp_directive): Likewise. + +2018-06-13 Cesar Philippidis <cesar@codesourcery.com> + PR fortran/85702 * openmp.c (gfc_match_oacc_wait): Use %C to report error location. diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index a3693a1..4ce6eb4 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -624,6 +624,8 @@ decode_oacc_directive (void) gfc_clear_error (); /* Clear any pending errors. */ gfc_clear_warning (); /* Clear any pending warnings. */ + gfc_matching_function = false; + if (gfc_pure (NULL)) { gfc_error_now ("OpenACC directives at %C may not appear in PURE " @@ -795,6 +797,8 @@ decode_omp_directive (void) gfc_clear_error (); /* Clear any pending errors. */ gfc_clear_warning (); /* Clear any pending warnings. */ + gfc_matching_function = false; + if (gfc_current_state () == COMP_FUNCTION && gfc_current_block ()->result->ts.kind == -1) spec_only = true; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 13a18ba..c56ef09 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2018-06-13 Cesar Philippidis <cesar@codesourcery.com> + PR fortran/85703 + * gfortran.dg/goacc/pr85703.f90: New test. + * gfortran.dg/gomp/pr85703.f90: New test. + +2018-06-13 Cesar Philippidis <cesar@codesourcery.com> + PR fortran/85702 * gfortran.dg/goacc/pr85702.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/goacc/pr85703.f90 b/gcc/testsuite/gfortran.dg/goacc/pr85703.f90 new file mode 100644 index 0000000..d9de1a3 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/goacc/pr85703.f90 @@ -0,0 +1,9 @@ +! PR fortran/85703 +! { dg-do compile } + +character function f() + !$acc parallel loop reduction(+:a) + do i = 1, 4 + end do + !$acc end parallel loop +end diff --git a/gcc/testsuite/gfortran.dg/gomp/pr85703.f90 b/gcc/testsuite/gfortran.dg/gomp/pr85703.f90 new file mode 100644 index 0000000..7ca2b93 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/pr85703.f90 @@ -0,0 +1,8 @@ +! PR fortran/85703 +! { dg-do compile } + +character function f() + !$omp single + !$omp end single + f = 'a' +end |