diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-08-14 18:39:07 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-08-14 18:39:07 +0200 |
| commit | 4875c29c86812d73c88b9bb16d5c2d5bc7259d4d (patch) | |
| tree | e1ef6a424a62fe46d42b788d6fdf0b41c4304b39 /gcc/fortran/openmp.c | |
| parent | df5d402aba66d2e83690dadb6267accc6539e220 (diff) | |
| download | gcc-4875c29c86812d73c88b9bb16d5c2d5bc7259d4d.zip gcc-4875c29c86812d73c88b9bb16d5c2d5bc7259d4d.tar.gz gcc-4875c29c86812d73c88b9bb16d5c2d5bc7259d4d.tar.bz2 | |
re PR fortran/62076 (testsuite failure in udr2.90)
PR fortran/62076
* openmp.c (gfc_match_omp_clauses): When failed to match
operator name, defined op name or name, set buffer to
empty string. Don't call gfc_find_omp_udr if buffer is empty
string.
(gfc_match_omp_declare_reduction): Call gfc_undo_symbols ()
before calling gfc_free_omp_udr.
From-SVN: r213971
Diffstat (limited to 'gcc/fortran/openmp.c')
| -rw-r--r-- | gcc/fortran/openmp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 410efb1..49c3b9e 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -464,7 +464,11 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, unsigned int mask, || !gfc_add_intrinsic (&sym->attr, NULL))) rop = OMP_REDUCTION_NONE; } - gfc_omp_udr *udr = gfc_find_omp_udr (gfc_current_ns, buffer, NULL); + else + buffer[0] = '\0'; + gfc_omp_udr *udr + = (buffer[0] + ? gfc_find_omp_udr (gfc_current_ns, buffer, NULL) : NULL); gfc_omp_namelist **head = NULL; if (rop == OMP_REDUCTION_NONE && udr) rop = OMP_REDUCTION_USER; @@ -1240,6 +1244,7 @@ gfc_match_omp_declare_reduction (void) syntax: gfc_current_locus = old_loc; gfc_current_ns = combiner_ns->parent; + gfc_undo_symbols (); gfc_free_omp_udr (omp_udr); return MATCH_ERROR; } |