mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-13 05:09:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Save typespec for empty array constructor.

Browse Source 
2020-01-09  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/65428
	* array.c (empty_constructor): New variable.
	(empty_ts): New variable.
	(expand_constructor): Save typespec in empty_ts.
	Unset empty_constructor if there is an element.
	(gfc_expand_constructor): Initialize empty_constructor
	and empty_ts.  If there was no explicit constructor
	type and the constructor is empty, take the type from
	empty_ts.

2020-01-09  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/65428
	* gfortran.dg/zero_sized_11.f90: New test.

From-SVN: r280063
This commit is contained in:
Thomas Koenig 2020-01-09 20:57:33 +00:00
parent 2b8ce6216e
commit d636017868
5 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/fortran/ChangeLog
View File

@ -1,3 +1,15 @@
2020-01-09 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/65428
* array.c (empty_constructor): New variable.
(empty_ts): New variable.
(expand_constructor): Save typespec in empty_ts.
Unset empty_constructor if there is an element.
(gfc_expand_constructor): Initialize empty_constructor
and empty_ts. If there was no explicit constructor
type and the constructor is empty, take the type from
empty_ts.
2020-01-09 Tobias Burnus <tobias@codesourcery.com>
PR fortran/84135

18
gcc/fortran/array.c
View File

@ -1759,6 +1759,11 @@ cleanup:
return t;
}
/* Variables for noticing if all constructors are empty, and
if any of them had a type. */
static bool empty_constructor;
static gfc_typespec empty_ts;
/* Expand a constructor into constant constructors without any
iterators, calling the work function for each of the expanded
@ -1782,6 +1787,9 @@ expand_constructor (gfc_constructor_base base)
e = c->expr;
if (empty_constructor)
empty_ts = e->ts;
if (e->expr_type == EXPR_ARRAY)
{
if (!expand_constructor (e->value.constructor))
@ -1790,6 +1798,7 @@ expand_constructor (gfc_constructor_base base)
continue;
}
empty_constructor = false;
e = gfc_copy_expr (e);
if (!gfc_simplify_expr (e, 1))
{
@ -1873,6 +1882,8 @@ gfc_expand_constructor (gfc_expr *e, bool fatal)
iter_stack = NULL;
empty_constructor = true;
gfc_clear_ts (&empty_ts);
current_expand.expand_work_function = expand;
if (!expand_constructor (e->value.constructor))
@ -1882,6 +1893,13 @@ gfc_expand_constructor (gfc_expr *e, bool fatal)
goto done;
}
/* If we don't have an explicit constructor type, and there
were only empty constructors, then take the type from
them. */
if (constructor_ts.type == BT_UNKNOWN && empty_constructor)
e->ts = empty_ts;
gfc_constructor_free (e->value.constructor);
e->value.constructor = current_expand.base;

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2020-01-09 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/65428
* gfortran.dg/zero_sized_11.f90: New test.
* gfortran.dg/zero_sized_12.f90: New test.
2020-01-09 Richard Sandiford <richard.sandiford@arm.com>
* g++.target/aarch64/sve/acle/general-c++/mul_lane_1.c: New test.

8
gcc/testsuite/gfortran.dg/zero_sized_11.f90 Normal file
View File

@ -0,0 +1,8 @@
! { dg-do compile }
! PR 65428 - this used to ICE. Original test case by FX Coudert.
program p
integer :: i
print *, [shape(1)]
print *, [[ integer :: ]]
print *, (/ (/ (i, i=1,0) /) /)
end

17
gcc/testsuite/gfortran.dg/zero_sized_12.f90 Normal file
View File

@ -0,0 +1,17 @@
! { dg-do compile }
! PR 65248 - this used to ICE. Test case by Tobias Burnus.
program main
! C7110 (R770) If type-spec is omitted, each ac-value expression in the
! array-constructor shall have the same declared type and kind type parameters
! Should be fine as there is either no or only one ac-value:
print *, [[integer ::],[real::]]
print *, [[integer ::],[real::], [1], [real ::]]
print *, [[integer ::],[real::], ["ABC"], [real ::]] // "ABC"
print *, [integer :: [integer ::],[real::]]
! OK - accepted
print *, [integer :: [1],[1.0]]
end