diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-11-18 22:51:39 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-11-18 22:51:39 +0000 |
| commit | 9231aa17d6498905234d8e35216b324a1b067c8c (patch) | |
| tree | c50d7aa9f872e8e46b85f3cbb814297892dddcaf /gcc | |
| parent | c29c36ad5d0b283404cbbaae75a4b9fb827491f2 (diff) | |
| download | gcc-9231aa17d6498905234d8e35216b324a1b067c8c.zip gcc-9231aa17d6498905234d8e35216b324a1b067c8c.tar.gz gcc-9231aa17d6498905234d8e35216b324a1b067c8c.tar.bz2 | |
re PR fortran/43996 (ICE in gfc_conv_array_initializer due to incomplete simplification of init expressions)
2015-11-18 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/43996
* simplify.c (gfc_simplify_spread): Issue error for too large array
constructor in a PARAMETER statement.
2015-11-18 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/43996
* gfortran.dg/pr43996.f90: New test.
From-SVN: r230579
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 20 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr43996.f90 | 7 |
4 files changed, 34 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 34bc058..5e10387 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2015-11-18 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/43996 + * simplify.c (gfc_simplify_spread): Issue error for too large array + constructor in a PARAMETER statement. + 2015-11-17 Steven G. Kargl <kargl@gcc.gnu.org> * primary.c (gfc_match_structure_constructor): Fix whitespace. diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 9b58b99..4df3fe6 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -5991,8 +5991,8 @@ gfc_simplify_spacing (gfc_expr *x) gfc_expr * gfc_simplify_spread (gfc_expr *source, gfc_expr *dim_expr, gfc_expr *ncopies_expr) { - gfc_expr *result = 0L; - int i, j, dim, ncopies; + gfc_expr *result = NULL; + int nelem, i, j, dim, ncopies; mpz_t size; if ((!gfc_is_constant_expr (source) @@ -6019,8 +6019,20 @@ gfc_simplify_spread (gfc_expr *source, gfc_expr *dim_expr, gfc_expr *ncopies_exp else mpz_init_set_ui (size, 1); - if (mpz_get_si (size)*ncopies > flag_max_array_constructor) - return NULL; + nelem = mpz_get_si (size) * ncopies; + if (nelem > flag_max_array_constructor) + { + if (gfc_current_ns->sym_root->n.sym->attr.flavor == FL_PARAMETER) + { + gfc_error ("The number of elements (%d) in the array constructor " + "at %L requires an increase of the allowed %d upper " + "limit. See %<-fmax-array-constructor%> option.", + nelem, &source->where, flag_max_array_constructor); + return &gfc_bad_expr; + } + else + return NULL; + } if (source->expr_type == EXPR_CONSTANT) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3ac9cb8..b820e13 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-11-18 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/43996 + * gfortran.dg/pr43996.f90: New test. + 2015-11-18 Joseph Myers <joseph@codesourcery.com> PR c/65083 diff --git a/gcc/testsuite/gfortran.dg/pr43996.f90 b/gcc/testsuite/gfortran.dg/pr43996.f90 new file mode 100644 index 0000000..d0a4daf --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr43996.f90 @@ -0,0 +1,7 @@ +! { dg-do compile } +! PR fortran/43996 +! +real, parameter :: a(720,360) = spread((/(j, j=1,720) /), dim=2, ncopies=360) ! { dg-error "number of elements" } +real x +x = a(720,360) +end |