diff options
| author | Daniel Kraft <d@domob.eu> | 2008-09-21 17:33:37 +0200 |
|---|---|---|
| committer | Daniel Kraft <domob@gcc.gnu.org> | 2008-09-21 17:33:37 +0200 |
| commit | 4b7f8314ba66ab03974e94bf80718b157cc1350f (patch) | |
| tree | 7e12ab2f71e4936cfd889e91f274ac7585d3640b /gcc/fortran/trans-decl.c | |
| parent | 74a9b8976475b250d6d9d68b2ea557cc0e778f4e (diff) | |
| download | gcc-4b7f8314ba66ab03974e94bf80718b157cc1350f.zip gcc-4b7f8314ba66ab03974e94bf80718b157cc1350f.tar.gz gcc-4b7f8314ba66ab03974e94bf80718b157cc1350f.tar.bz2 | |
re PR fortran/35846 (ICE on nested character constructors)
2008-09-21 Daniel Kraft <d@domob.eu>
PR fortran/35846
* trans.h (gfc_conv_string_length): New argument `expr'.
* trans-expr.c (flatten_array_ctors_without_strlen): New method.
(gfc_conv_string_length): New argument `expr' that is used in a new
special case handling if cl->length is NULL.
(gfc_conv_subref_array_arg): Pass expr to gfc_conv_string_length.
* trans-array.c (gfc_conv_expr_descriptor): Ditto.
(gfc_trans_auto_array_allocation): Pass NULL as new expr.
(gfc_trans_g77_array), (gfc_trans_dummy_array_bias): Ditto.
(gfc_trans_deferred_array): Ditto.
(gfc_trans_array_constructor): Save and restore old values of globals
used for bounds checking.
* trans-decl.c (gfc_trans_dummy_character): Ditto.
(gfc_trans_auto_character_variable): Ditto.
2008-09-21 Daniel Kraft <d@domob.eu>
PR fortran/35846
* gfortran.dg/nested_array_constructor_1.f90: New test.
* gfortran.dg/nested_array_constructor_2.f90: New test.
* gfortran.dg/nested_array_constructor_3.f90: New test.
* gfortran.dg/nested_array_constructor_4.f90: New test.
* gfortran.dg/nested_array_constructor_5.f90: New test.
* gfortran.dg/nested_array_constructor_6.f90: New test.
From-SVN: r140529
Diffstat (limited to 'gcc/fortran/trans-decl.c')
| -rw-r--r-- | gcc/fortran/trans-decl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index ec00ee2..20253e6 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -2583,7 +2583,7 @@ gfc_trans_dummy_character (gfc_symbol *sym, gfc_charlen *cl, tree fnbody) gfc_start_block (&body); /* Evaluate the string length expression. */ - gfc_conv_string_length (cl, &body); + gfc_conv_string_length (cl, NULL, &body); gfc_trans_vla_type_sizes (sym, &body); @@ -2607,7 +2607,7 @@ gfc_trans_auto_character_variable (gfc_symbol * sym, tree fnbody) gfc_start_block (&body); /* Evaluate the string length expression. */ - gfc_conv_string_length (sym->ts.cl, &body); + gfc_conv_string_length (sym->ts.cl, NULL, &body); gfc_trans_vla_type_sizes (sym, &body); |