summaryrefslogtreecommitdiff
path: root/gcc/fortran/simplify.c
diff options
context:
space:
mode:
authorburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-08 12:21:58 +0000
committerburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-08 12:21:58 +0000
commitb3453f4dfd3d213704061d2c6fa030bb859ac1ed (patch)
tree2ff82853db8a48bc64fb95c669f3ff96ba4d13a5 /gcc/fortran/simplify.c
parent1d7354bb436efb6c4da3a81735d111a947afc16c (diff)
downloadgcc-b3453f4dfd3d213704061d2c6fa030bb859ac1ed.tar.gz
2013-06-08 Tobias Burnus <burnus@net-b.de>
PR fortran/57553 * simplify.c (gfc_simplify_storage_size): Handle literal strings. * trans-intrinsic.c (gfc_conv_intrinsic_storage_size): Add missing fold_convert. 2013-06-08 Tobias Burnus <burnus@net-b.de> PR fortran/57553 * gfortran.dg/storage_size_4.f90: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199850 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/simplify.c')
-rw-r--r--gcc/fortran/simplify.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 815043b2e11..683d58b6ee8 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -5717,7 +5717,7 @@ gfc_simplify_storage_size (gfc_expr *x,
if (x->ts.type == BT_CLASS || x->ts.deferred)
return NULL;
- if (x->ts.type == BT_CHARACTER
+ if (x->ts.type == BT_CHARACTER && x->expr_type != EXPR_CONSTANT
&& (!x->ts.u.cl || !x->ts.u.cl->length
|| x->ts.u.cl->length->expr_type != EXPR_CONSTANT))
return NULL;