Simplify recently introduced check to simplify_bound.

gcc/fortran/ChangeLog:

2020-04-15  Fritz Reese  <foreese@gcc.gnu.org>
	Linus Koenig <link@sig-st.de>

	PR fortran/94192
	* simplify.c (simplify_bound): Simplify condition for error check.
This commit is contained in:
Fritz Reese 2020-04-15 11:44:40 -04:00
parent d4f655724c
commit 49795733fd
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2020-04-15 Fritz Reese <foreese@gcc.gnu.org>
Linus Koenig <link@sig-st.de>
PR fortran/94192
* simplify.c (simplify_bound): Simplify condition for error check.
2020-04-14 Tobias Burnus <tobias@codesourcery.com>
* module.c (gfc_match_use): Fix name-conflict check for use-associating

View File

@ -4159,10 +4159,6 @@ simplify_bound (gfc_expr *array, gfc_expr *dim, gfc_expr *kind, int upper)
gfc_array_spec *as;
int d;
/* Do not attempt to resolve if error has already been issued. */
if (array->symtree && array->symtree->n.sym->error)
return NULL;
if (array->ts.type == BT_CLASS)
return NULL;
@ -4173,6 +4169,10 @@ simplify_bound (gfc_expr *array, gfc_expr *dim, gfc_expr *kind, int upper)
goto done;
}
/* Do not attempt to resolve if error has already been issued. */
if (array->symtree->n.sym->error)
return NULL;
/* Follow any component references. */
as = array->symtree->n.sym->as;
for (ref = array->ref; ref; ref = ref->next)