aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog8
-rw-r--r--gcc/fortran/interface.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ab59584..9c0db26 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,10 +1,16 @@
+2016-11-09 Mikael Morin <mikael@gcc.gnu.org>
+ Janus Weil <janus@gcc.gnu.org>
+
+ PR fortran/46459
+ * interface.c (compare_actual_formal): Add safety checks to avoid ICE.
+
2016-11-09 Fritz O. Reese <fritzoreese@gmail.com>
PR fortran/78259
* trans-expr.c (gfc_trans_subcomponent_assign): Guard against NULL
values.
-2016-11-09 Steve Kargl <kargl@gcc.gnu.org>
+2016-11-09 Steven G. Kargl <kargl@gcc.gnu.org>
Janus Weil <janus@gcc.gnu.org>
PR fortran/60777
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index 4dd432ef..98a61df 100644
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -3190,6 +3190,7 @@ compare_actual_formal (gfc_actual_arglist **ap, gfc_formal_arglist *formal,
shape array, if the dummy argument has the VOLATILE attribute. */
if (f->sym->attr.volatile_
+ && a->expr->expr_type == EXPR_VARIABLE
&& a->expr->symtree->n.sym->as
&& a->expr->symtree->n.sym->as->type == AS_ASSUMED_SHAPE
&& !(f->sym->as && f->sym->as->type == AS_ASSUMED_SHAPE))
@@ -3219,6 +3220,7 @@ compare_actual_formal (gfc_actual_arglist **ap, gfc_formal_arglist *formal,
dummy argument has the VOLATILE attribute. */
if (f->sym->attr.volatile_
+ && a->expr->expr_type == EXPR_VARIABLE
&& a->expr->symtree->n.sym->attr.pointer
&& a->expr->symtree->n.sym->as
&& !(f->sym->as