diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2019-02-28 21:31:01 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2019-02-28 21:31:01 +0100 |
| commit | 6f87db2d7823ff70eca4fa76950aafe8a98d7356 (patch) | |
| tree | 63f9d34cc4c79ffa6aef5199ea0ce3a0ac966e72 /gcc/fortran | |
| parent | 80f52b400e1fc770c96d5e28ac7343aac3733df9 (diff) | |
| download | gcc-6f87db2d7823ff70eca4fa76950aafe8a98d7356.zip gcc-6f87db2d7823ff70eca4fa76950aafe8a98d7356.tar.gz gcc-6f87db2d7823ff70eca4fa76950aafe8a98d7356.tar.bz2 | |
[PR72741, PR89433] Accept intrinsic symbols in Fortran OpenACC 'routine' directives
gcc/fortran/
PR fortran/72741
PR fortran/89433
* openmp.c (gfc_match_oacc_routine): Accept intrinsic symbols.
gcc/testsuite/
PR fortran/72741
PR fortran/89433
* gfortran.dg/goacc/routine-6.f90: Update
* gfortran.dg/goacc/routine-intrinsic-1.f: New file.
* gfortran.dg/goacc/routine-intrinsic-2.f: Likewise.
Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com>
From-SVN: r269285
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/openmp.c | 33 |
2 files changed, 35 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 85ce5bc..78c6324 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2019-02-28 Thomas Schwinge <thomas@codesourcery.com> + Cesar Philippidis <cesar@codesourcery.com> + + PR fortran/72741 + PR fortran/89433 + * openmp.c (gfc_match_oacc_routine): Accept intrinsic symbols. + 2019-02-26 Harald Anlauf <anlauf@gmx.de> PR fortran/89492 diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index dfd4be8..6999ac3 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -2275,8 +2275,9 @@ match gfc_match_oacc_routine (void) { locus old_loc; - gfc_symbol *sym = NULL; match m; + gfc_intrinsic_sym *isym = NULL; + gfc_symbol *sym = NULL; gfc_omp_clauses *c = NULL; gfc_oacc_routine_name *n = NULL; @@ -2296,12 +2297,19 @@ gfc_match_oacc_routine (void) if (m == MATCH_YES) { char buffer[GFC_MAX_SYMBOL_LEN + 1]; - gfc_symtree *st; m = gfc_match_name (buffer); if (m == MATCH_YES) { - st = gfc_find_symtree (gfc_current_ns->sym_root, buffer); + gfc_symtree *st = NULL; + + /* First look for an intrinsic symbol. */ + isym = gfc_find_function (buffer); + if (!isym) + isym = gfc_find_subroutine (buffer); + /* If no intrinsic symbol found, search the current namespace. */ + if (!isym) + st = gfc_find_symtree (gfc_current_ns->sym_root, buffer); if (st) { sym = st->n.sym; @@ -2310,7 +2318,7 @@ gfc_match_oacc_routine (void) sym = NULL; } - if (st == NULL + if ((isym == NULL && st == NULL) || (sym && !sym->attr.external && !sym->attr.function @@ -2344,7 +2352,19 @@ gfc_match_oacc_routine (void) != MATCH_YES)) return MATCH_ERROR; - if (sym != NULL) + if (isym != NULL) + { + /* Diagnose any OpenACC 'routine' directive that doesn't match the + (implicit) one with a 'seq' clause. */ + if (c && (c->gang || c->worker || c->vector)) + { + gfc_error ("Intrinsic symbol specified in !$ACC ROUTINE ( NAME )" + " at %C marked with incompatible GANG, WORKER, or VECTOR" + " clause"); + goto cleanup; + } + } + else if (sym != NULL) { n = gfc_get_oacc_routine_name (); n->sym = sym; @@ -2364,6 +2384,9 @@ gfc_match_oacc_routine (void) gfc_current_ns->proc_name->attr.oacc_routine_lop = gfc_oacc_routine_lop (c); } + else + /* Something has gone wrong, possibly a syntax error. */ + goto cleanup; if (n) n->clauses = c; |