From: Fritz Reese <foreese@gcc.gnu.org>
Date: Wed, 15 Apr 2020 15:44:40 +0000 (-0400)
Subject: Simplify recently introduced check to simplify_bound.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=49795733fdcc3a804dab59b63f86d5ebe4541374;p=gcc.git

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.
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 9473ecbe1bb..515b91210f4 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -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
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 807565b4e80..d5703e38251 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -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)