OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jakub Jelinek 2014-08-14 18:39:07 +02:00 committed by Jakub Jelinek
parent df5d402aba
commit 4875c29c86
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/fortran/ChangeLog
View File

@ -1,3 +1,13 @@
2014-08-14 Jakub Jelinek <jakub@redhat.com>
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.
2014-08-11 Richard Biener <rguenther@suse.de> 2014-08-11 Richard Biener <rguenther@suse.de>
PR fortran/61950 PR fortran/61950

7
gcc/fortran/openmp.c
View File

@ -464,7 +464,11 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, unsigned int mask,
|| !gfc_add_intrinsic (&sym->attr, NULL))) || !gfc_add_intrinsic (&sym->attr, NULL)))
rop = OMP_REDUCTION_NONE; 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; gfc_omp_namelist **head = NULL;
if (rop == OMP_REDUCTION_NONE && udr) if (rop == OMP_REDUCTION_NONE && udr)
rop = OMP_REDUCTION_USER; rop = OMP_REDUCTION_USER;
@ -1240,6 +1244,7 @@ gfc_match_omp_declare_reduction (void)
syntax: syntax:
gfc_current_locus = old_loc; gfc_current_locus = old_loc;
gfc_current_ns = combiner_ns->parent; gfc_current_ns = combiner_ns->parent;
gfc_undo_symbols ();
gfc_free_omp_udr (omp_udr); gfc_free_omp_udr (omp_udr);
return MATCH_ERROR; return MATCH_ERROR;
} }