aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog7
-rw-r--r--gcc/fortran/resolve.c7
2 files changed, 9 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c3b4a5c..1bd851a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,12 @@
2019-02-04 Martin Liska <mliska@suse.cz>
+ PR fortran/89185
+ * resolve.c (resolve_ref): Remove breakout variable as
+ we need to prevent prev = &(*prev)->next to happen
+ with *prev == NULL.
+
+2019-02-04 Martin Liska <mliska@suse.cz>
+
PR fortran/88912
* scanner.c (load_file): Report error for -fpre-include
file and do not ICE.
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 5e95777..92d27fc 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -5046,7 +5046,6 @@ resolve_ref (gfc_expr *expr)
int current_part_dimension, n_components, seen_part_dimension;
gfc_ref *ref, **prev;
bool equal_length;
- bool breakout;
for (ref = expr->ref; ref; ref = ref->next)
if (ref->type == REF_ARRAY && ref->u.ar.as == NULL)
@@ -5055,8 +5054,8 @@ resolve_ref (gfc_expr *expr)
break;
}
- breakout = false;
- for (prev = &expr->ref; !breakout && *prev != NULL; prev = &(*prev)->next)
+ for (prev = &expr->ref; *prev != NULL;
+ prev = *prev == NULL ? prev : &(*prev)->next)
switch ((*prev)->type)
{
case REF_ARRAY:
@@ -5082,8 +5081,6 @@ resolve_ref (gfc_expr *expr)
expr->ts.u.cl = ref->u.ss.length;
ref->u.ss.length = NULL;
gfc_free_ref_list (ref);
- if (*prev == NULL)
- breakout = true;
}
break;
}