procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fortran: Fix up initializers of param(0) PARAMETERs [PR103691]

Browse source 
On the gfortran.dg/pr103691.f90 testcase the Fortran ICE emits
  static real(kind=4) a[0] = {[0 ... -1]=2.0e+0};
That is an invalid RANGE_EXPR where the maximum is smaller than the minimum.

The following patch fixes that.  If TYPE_MAX_VALUE is smaller than
TYPE_MIN_VALUE, the array is empty and so doesn't need any initializer,
if the two are equal, we don't need to bother with a RANGE_EXPR and
can just use that INTEGER_CST as the index and finally for the 2+ values
in the range it uses a RANGE_EXPR as before.

2022-03-25  Jakub Jelinek  <jakub@redhat.com>

	PR fortran/103691
	* trans-array.cc (gfc_conv_array_initializer): If TYPE_MAX_VALUE is
	smaller than TYPE_MIN_VALUE (i.e. empty array), ignore the
	initializer; if TYPE_MIN_VALUE is equal to TYPE_MAX_VALUE, use just
	the TYPE_MIN_VALUE as index instead of RANGE_EXPR.
This commit is contained in:
Jakub Jelinek 2022-03-25 11:22:15 +01:00
parent 748f36a48b
commit 45e955b0a9
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gcc/fortran/trans-array.cc
View file

@ -6267,10 +6267,17 @@ gfc_conv_array_initializer (tree type, gfc_expr * expr)
else
gfc_conv_structure (&se, expr, 1);
CONSTRUCTOR_APPEND_ELT (v, build2 (RANGE_EXPR, gfc_array_index_type,
TYPE_MIN_VALUE (TYPE_DOMAIN (type)),
TYPE_MAX_VALUE (TYPE_DOMAIN (type))),
se.expr);
if (tree_int_cst_lt (TYPE_MAX_VALUE (TYPE_DOMAIN (type)),
TYPE_MIN_VALUE (TYPE_DOMAIN (type))))
break;
else if (tree_int_cst_equal (TYPE_MIN_VALUE (TYPE_DOMAIN (type)),
TYPE_MAX_VALUE (TYPE_DOMAIN (type))))
range = TYPE_MIN_VALUE (TYPE_DOMAIN (type));
else
range = build2 (RANGE_EXPR, gfc_array_index_type,
TYPE_MIN_VALUE (TYPE_DOMAIN (type)),
TYPE_MAX_VALUE (TYPE_DOMAIN (type)));
CONSTRUCTOR_APPEND_ELT (v, range, se.expr);
break;
case EXPR_ARRAY: