aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/array.c
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2021-12-01 13:30:25 +0100
committerMartin Liska <mliska@suse.cz>2021-12-01 13:30:25 +0100
commit4cba2fa027afd5f815bd9bf3965afe1972c7387c (patch)
treeefa05b4ca35e93c65eb1a2585d5ad3dd2dd3db32 /gcc/fortran/array.c
parent789b80d1fbd0b1d516b389bf11b5c70aa4d1088b (diff)
parentd376b73aa12d183e3040456c7641fb74500d0727 (diff)
downloadgcc-4cba2fa027afd5f815bd9bf3965afe1972c7387c.zip
gcc-4cba2fa027afd5f815bd9bf3965afe1972c7387c.tar.gz
gcc-4cba2fa027afd5f815bd9bf3965afe1972c7387c.tar.bz2
Merge branch 'master' into devel/sphinx
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))