aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorMark Eggleston <markeggleston@gcc.gnu.org>2020-02-18 15:54:13 +0000
committerMark Eggleston <markeggleston@gcc.gnu.org>2020-02-18 15:54:13 +0000
commit06119d691e27e25fd4f4486467ad95f7b545fde3 (patch)
treeb9c03f0e0c5fb9d25dbba9d92efb98427e8c8bd8 /gcc/fortran
parentfa1160f6e50500aa38162fefb43bfb10c25e0363 (diff)
downloadgcc-06119d691e27e25fd4f4486467ad95f7b545fde3.zip
gcc-06119d691e27e25fd4f4486467ad95f7b545fde3.tar.gz
gcc-06119d691e27e25fd4f4486467ad95f7b545fde3.tar.bz2
[fortran] ICE assign character pointer to non target PR93714
An ICE occurred if an attempt was made to assign a pointer to a character variable that has an length incorrectly specified using a real constant and does not have the target attribute. gcc/fortran/ChangeLog PR fortran/93714 * expr.c (gfc_check_pointer_assign): Move check for matching character length to after checking the lvalue attributes for target or pointer. gcc/testsuite/ChangeLog PR fortran/93714 * gfortran.dg/char_pointer_assign_6.f90: Look for no target message instead of length mismatch. * gfortran.dg/pr93714_1.f90 * gfortran.dg/pr93714_2.f90
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog7
-rw-r--r--gcc/fortran/expr.c14
2 files changed, 14 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5daaefd..7547dcc 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2020-02-18 Mark Eggleston <markeggleston@gcc.gnu.org>
+
+ PR fortran/93714
+ * expr.c (gfc_check_pointer_assign): Move check for
+ matching character length to after checking the lvalue
+ attributes for target or pointer.
+
2020-02-18 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/93601
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index a9698c3..79e00b4 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -4222,13 +4222,6 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue,
if (rvalue->expr_type == EXPR_NULL)
return true;
- if (lvalue->ts.type == BT_CHARACTER)
- {
- bool t = gfc_check_same_strlen (lvalue, rvalue, "pointer assignment");
- if (!t)
- return false;
- }
-
if (rvalue->expr_type == EXPR_VARIABLE && is_subref_array (rvalue))
lvalue->symtree->n.sym->attr.subref_array_pointer = 1;
@@ -4284,6 +4277,13 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue,
}
}
+ if (lvalue->ts.type == BT_CHARACTER)
+ {
+ bool t = gfc_check_same_strlen (lvalue, rvalue, "pointer assignment");
+ if (!t)
+ return false;
+ }
+
if (is_pure && gfc_impure_variable (rvalue->symtree->n.sym))
{
gfc_error ("Bad target in pointer assignment in PURE "