aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/array.c
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2021-11-27 21:43:52 +0100
committerHarald Anlauf <anlauf@gmx.de>2021-11-30 22:10:06 +0100
commit6b8ecbc6d6652d061d7c72c64352d51eca2df6ca (patch)
treee3b75288123b3aa54ba5a481ddb2a66c35ecb67d /gcc/fortran/array.c
parenta3e75c1491cd2d501081210925a89a65b1c1e5e5 (diff)
downloadgcc-6b8ecbc6d6652d061d7c72c64352d51eca2df6ca.zip
gcc-6b8ecbc6d6652d061d7c72c64352d51eca2df6ca.tar.gz
gcc-6b8ecbc6d6652d061d7c72c64352d51eca2df6ca.tar.bz2
Fortran: improve expansion of constant array expressions within constructors
gcc/fortran/ChangeLog: PR fortran/102787 * array.c (expand_constructor): When encountering a constant array expression or array section within a constructor, simplify it to enable better expansion. gcc/testsuite/ChangeLog: * gfortran.dg/array_constructor_54.f90: New test.
Diffstat (limited to 'gcc/fortran/array.c')
-rw-r--r--gcc/fortran/array.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 6552eaf..fbc6609 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -1804,6 +1804,12 @@ expand_constructor (gfc_constructor_base base)
if (empty_constructor)
empty_ts = e->ts;
+ /* Simplify constant array expression/section within constructor. */
+ if (e->expr_type == EXPR_VARIABLE && e->rank > 0 && e->ref
+ && e->symtree && e->symtree->n.sym
+ && e->symtree->n.sym->attr.flavor == FL_PARAMETER)
+ gfc_simplify_expr (e, 0);
+
if (e->expr_type == EXPR_ARRAY)
{
if (!expand_constructor (e->value.constructor))