diff options
| author | Francois-Xavier Coudert <coudert@clipper.ens.fr> | 2006-04-29 18:31:26 +0200 |
|---|---|---|
| committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2006-04-29 16:31:26 +0000 |
| commit | 49914d0380452c7dd89fb976d02b0e170694d553 (patch) | |
| tree | a1cdf2e149765fe457e2564ec009f6c60b4be252 /gcc/fortran/simplify.c | |
| parent | c69a7fb7a6c969ff242f8ba82c52cd330e290363 (diff) | |
| download | gcc-49914d0380452c7dd89fb976d02b0e170694d553.zip gcc-49914d0380452c7dd89fb976d02b0e170694d553.tar.gz gcc-49914d0380452c7dd89fb976d02b0e170694d553.tar.bz2 | |
re PR fortran/25681 (ICE with len of array of derived type)
PR fortran/25681
* simplify.c (simplify_len): Character variables with constant
length can be simplified.
* gfortran.df/char_type_len.f90: New test.
From-SVN: r113376
Diffstat (limited to 'gcc/fortran/simplify.c')
| -rw-r--r-- | gcc/fortran/simplify.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index d5dfb34..403f9c7 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -1930,14 +1930,24 @@ gfc_simplify_len (gfc_expr * e) { gfc_expr *result; - if (e->expr_type != EXPR_CONSTANT) - return NULL; - - result = gfc_constant_result (BT_INTEGER, gfc_default_integer_kind, - &e->where); + if (e->expr_type == EXPR_CONSTANT) + { + result = gfc_constant_result (BT_INTEGER, gfc_default_integer_kind, + &e->where); + mpz_set_si (result->value.integer, e->value.character.length); + return range_check (result, "LEN"); + } - mpz_set_si (result->value.integer, e->value.character.length); - return range_check (result, "LEN"); + if (e->ts.cl != NULL && e->ts.cl->length != NULL + && e->ts.cl->length->expr_type == EXPR_CONSTANT) + { + result = gfc_constant_result (BT_INTEGER, gfc_default_integer_kind, + &e->where); + mpz_set (result->value.integer, e->ts.cl->length->value.integer); + return range_check (result, "LEN"); + } + + return NULL; } |