This patch fixes two issues:
* storage_size('aa') was rejected as constant expression - as
ts.u.cl-length == 0.
* In trans*.c, there was a fold_convert missing (- ICE). Additionally,
I have replaced the detour to generate a tree containing the value 8
via a fortran expression.
Build and regtested on x86-64-gnu-linux.
OK for the trunk?
Tobias
2013-06-07 Tobias Burnus bur...@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.
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 815043b..683d58b 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;
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index eca907e..3fbf193 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -5249,12 +5249,10 @@ static void
gfc_conv_intrinsic_storage_size (gfc_se *se, gfc_expr *expr)
{
gfc_expr *arg;
- gfc_se argse,eight;
+ gfc_se argse;
tree type, result_type, tmp;
arg = expr-value.function.actual-expr;
- gfc_init_se (eight, NULL);
- gfc_conv_expr (eight, gfc_get_int_expr (expr-ts.kind, NULL, 8));
gfc_init_se (argse, NULL);
result_type = gfc_get_int_type (expr-ts.kind);
@@ -5285,11 +5283,12 @@ gfc_conv_intrinsic_storage_size (gfc_se *se, gfc_expr *expr)
if (arg-ts.type == BT_CHARACTER)
tmp = size_of_string_in_bytes (arg-ts.kind, argse.string_length);
else
-tmp = fold_convert (result_type, size_in_bytes (type));
+tmp = size_in_bytes (type);
+ tmp = fold_convert (result_type, tmp);
done:
se-expr = fold_build2_loc (input_location, MULT_EXPR, result_type, tmp,
- eight.expr);
+ build_int_cst (result_type, BITS_PER_UNIT));
gfc_add_block_to_block (se-pre, argse.pre);
}
--- /dev/null 2013-06-07 09:13:23.024185858 +0200
+++ gcc/gcc/testsuite/gfortran.dg/storage_size_4.f90 2013-06-07 17:34:12.719284544 +0200
@@ -0,0 +1,23 @@
+! { dg-do compile }
+! { dg-options -fdump-tree-original }
+!
+! PR fortran/57553
+!
+! Ensure that there is no ICE and that compile-time simplication works.
+!
+ use iso_fortran_env
+ implicit none
+ integer, parameter :: ESize = storage_size('a')
+ integer, parameter :: ESize2 = storage_size('aa')
+ if ( ESize/CHARACTER_STORAGE_SIZE /= 1) call abort()
+ if ( ESize2/CHARACTER_STORAGE_SIZE /= 2) call abort()
+end
+
+subroutine S ( A )
+ character(len=*), intent(in) :: A
+ integer :: ESize = 4
+ esize = ( storage_size(a) + 7 ) / 8
+end
+
+! { dg-final { scan-tree-dump-not abort original } }
+! { dg-final { cleanup-tree-dump original } }
