Fortran: validate shape of arrays in constructors against declarations

gcc/fortran/ChangeLog:

	PR fortran/102685
	* decl.c (match_clist_expr): Set rank/shape of clist initializer
	to match LHS.
	* resolve.c (resolve_structure_cons): In a structure constructor,
	compare shapes of array components against declared shape.

gcc/testsuite/ChangeLog:

	PR fortran/102685
	* gfortran.dg/derived_constructor_char_1.f90: Fix invalid code.
	* gfortran.dg/pr70931.f90: Likewise.
	* gfortran.dg/transfer_simplify_2.f90: Likewise.
	* gfortran.dg/pr102685.f90: New test.

Co-authored-by: Tobias Burnus <tobias@codesourcery.com>
This commit is contained in:
Harald Anlauf 2021-10-15 21:23:17 +02:00
parent 4aef14b095
commit 1e819bd95e
6 changed files with 68 additions and 6 deletions

View File

@ -896,9 +896,6 @@ match_clist_expr (gfc_expr **result, gfc_typespec *ts, gfc_array_spec *as)
expr->ts = *ts;
expr->value.constructor = array_head;
expr->rank = as->rank;
expr->shape = gfc_get_shape (expr->rank);
/* Validate sizes. We built expr ourselves, so cons_size will be
constant (we fail above for non-constant expressions).
We still need to verify that the sizes match. */
@ -911,6 +908,12 @@ match_clist_expr (gfc_expr **result, gfc_typespec *ts, gfc_array_spec *as)
mpz_clear (cons_size);
if (cmp)
goto cleanup;
/* Set the rank/shape to match the LHS as auto-reshape is implied. */
expr->rank = as->rank;
expr->shape = gfc_get_shape (as->rank);
for (int i = 0; i < as->rank; ++i)
spec_dimen_size (as, i, &expr->shape[i]);
}
/* Make sure scalar types match. */

View File

@ -1454,6 +1454,34 @@ resolve_structure_cons (gfc_expr *expr, int init)
}
}
/* Validate shape, except for dynamic or PDT arrays. */
if (cons->expr->expr_type == EXPR_ARRAY && rank == cons->expr->rank
&& comp->as && !comp->attr.allocatable && !comp->attr.pointer
&& !comp->attr.pdt_array)
{
mpz_t len;
mpz_init (len);
for (int n = 0; n < rank; n++)
{
gcc_assert (comp->as->upper[n]->expr_type == EXPR_CONSTANT
&& comp->as->lower[n]->expr_type == EXPR_CONSTANT);
mpz_set_ui (len, 1);
mpz_add (len, len, comp->as->upper[n]->value.integer);
mpz_sub (len, len, comp->as->lower[n]->value.integer);
if (mpz_cmp (cons->expr->shape[n], len) != 0)
{
gfc_error ("The shape of component %qs in the structure "
"constructor at %L differs from the shape of the "
"declared component for dimension %d (%ld/%ld)",
comp->name, &cons->expr->where, n+1,
mpz_get_si (cons->expr->shape[n]),
mpz_get_si (len));
t = false;
}
}
mpz_clear (len);
}
if (!comp->attr.pointer || comp->attr.proc_pointer
|| cons->expr->expr_type == EXPR_NULL)
continue;

View File

@ -5,7 +5,7 @@
!
!
Type :: t5
character (len=5) :: txt(4)
character (len=5) :: txt(2)
End Type t5
character (len=3), parameter :: str3(2) = [ "ABC", "ZYX" ]

View File

@ -0,0 +1,30 @@
! { dg-do compile }
! PR fortran/102685
program p
type t
integer :: a(2)
end type
type(t), parameter :: x0 = t([2]) ! { dg-error "shape of component" }
type(t), parameter :: x1(2) = t([2]) ! { dg-error "shape of component" }
type(t), parameter :: x(2) = t([integer::]) ! { dg-error "shape of component" }
type u
integer :: a
integer :: b(0)
end type
type(u), parameter :: z0(2) = u(1, [integer::]) ! valid
type(u), parameter :: z1 = u(1, 2 ) ! valid
type(u), parameter :: z2(2) = u(1, 2 ) ! valid
type(u), parameter :: z3 = u(1, [2]) ! { dg-error "shape of component" }
type(u), parameter :: z4(2) = u(1, [2]) ! { dg-error "shape of component" }
type v
integer :: a(2,1)
end type
type(v), parameter :: y0 = v(reshape([1,2],[2,1])) ! valid
type(v), parameter :: y1 = v(reshape([1,2],[1,2])) ! { dg-error "shape of component" }
type(v), parameter :: y(1) = v(reshape([1,2],[1,2])) ! { dg-error "shape of component" }
print *, x0,x,x1,y0,y1,y,z0,z1,z2,z3,z4
end

View File

@ -5,6 +5,7 @@ program p
integer :: a
integer :: b(0)
end type
type(t), parameter :: z = t(1, [2])
! type(t), parameter :: z = t(1, [2]) ! original invalid code
type(t), parameter :: z = t(1, [integer::])
print *, z
end

View File

@ -145,7 +145,7 @@ contains
real(4) :: x(2)
end type mytype
type (mytype), parameter :: dt1(2) = transfer (c1, mytype ((/1.0,2.0,3.0,4.0/)), 2)
type (mytype), parameter :: dt1(2) = transfer (c1, mytype ((/1.0,2.0/)), 2)
type (mytype) :: dt2(2)
dt2 = transfer (c2, dt2);