aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/simplify.c
diff options
context:
space:
mode:
authorPaul Thomas <pault@gcc.gnu.org>2009-06-22 04:39:40 +0000
committerPaul Thomas <pault@gcc.gnu.org>2009-06-22 04:39:40 +0000
commit0e6640d89daa5b3e1515d84823af83f9ecb40209 (patch)
tree22bf83720eefa43246cf9fd40e0a13617870b995 /gcc/fortran/simplify.c
parente9402aab8a080c1a14e7a4c6f942d6794735e6b0 (diff)
downloadgcc-0e6640d89daa5b3e1515d84823af83f9ecb40209.zip
gcc-0e6640d89daa5b3e1515d84823af83f9ecb40209.tar.gz
gcc-0e6640d89daa5b3e1515d84823af83f9ecb40209.tar.bz2
re PR fortran/40472 (Simplification of spread intrinsic takes a long time)
2009-06-22 Paul Thomas <pault@gcc.gnu.org> PR fortran/40472 * simplify.c (gfc_simplify_spread): Restrict the result size to the limit for an array constructor. 2009-06-22 Paul Thomas <pault@gcc.gnu.org> PR fortran/40472 * gfortran.dg/spread_size_limit.f90: New test. From-SVN: r148775
Diffstat (limited to 'gcc/fortran/simplify.c')
-rw-r--r--gcc/fortran/simplify.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 11650f3..79341d3 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -5099,6 +5099,7 @@ gfc_simplify_spread (gfc_expr *source, gfc_expr *dim_expr, gfc_expr *ncopies_exp
{
gfc_expr *result = 0L;
int i, j, dim, ncopies;
+ mpz_t size;
if ((!gfc_is_constant_expr (source)
&& !is_constant_array_expr (source))
@@ -5114,6 +5115,12 @@ gfc_simplify_spread (gfc_expr *source, gfc_expr *dim_expr, gfc_expr *ncopies_exp
gfc_extract_int (ncopies_expr, &ncopies);
ncopies = MAX (ncopies, 0);
+ /* Do not allow the array size to exceed the limit for an array
+ constructor. */
+ gfc_array_size (source, &size);
+ if (mpz_get_si (size)*ncopies > gfc_option.flag_max_array_constructor)
+ return NULL;
+
if (source->expr_type == EXPR_CONSTANT)
{
gcc_assert (dim == 0);