From 6b8ecbc6d6652d061d7c72c64352d51eca2df6ca Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Sat, 27 Nov 2021 21:43:52 +0100 Subject: 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. --- gcc/fortran/array.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gcc/fortran/array.c') 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)) -- cgit v1.1