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>
(cherry picked from commit 1e819bd95ebeefc1dc469daa1855ce005cb77822)

diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index d2b667e45c6d5fa2e4d904d9260445ae1156d0df..602ad3e59bde93c1e2bd8613f895080e4c1027d3 100644 (file)
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -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. */

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 71ce8804c0ee34b2c8362168b31ea5db82657a89..277af0e61b0ed92779d2d9fc92017b644c22cf6b 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -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;

diff --git a/gcc/testsuite/gfortran.dg/derived_constructor_char_1.f90 b/gcc/testsuite/gfortran.dg/derived_constructor_char_1.f90
index 892a9c9f4c1d5dcafb0179854ecd084b9b414ac1..91fc4c902d82352376db7cb3675f6d1e307815fb 100644 (file)
--- a/gcc/testsuite/gfortran.dg/derived_constructor_char_1.f90
+++ b/gcc/testsuite/gfortran.dg/derived_constructor_char_1.f90
@@ -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" ]

diff --git a/gcc/testsuite/gfortran.dg/pr102685.f90 b/gcc/testsuite/gfortran.dg/pr102685.f90
new file mode 100644 (file)
index 0000000..d325c27
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr102685.f90
@@ -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

diff --git a/gcc/testsuite/gfortran.dg/pr70931.f90 b/gcc/testsuite/gfortran.dg/pr70931.f90
index 08ecd687752649feb06bfafa2ddc1e648dd94dc5..4444b5eec3b7f08b196f385d62253525fd1bee11 100644 (file)
--- a/gcc/testsuite/gfortran.dg/pr70931.f90
+++ b/gcc/testsuite/gfortran.dg/pr70931.f90
@@ -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

diff --git a/gcc/testsuite/gfortran.dg/transfer_simplify_2.f90 b/gcc/testsuite/gfortran.dg/transfer_simplify_2.f90
index e0f3f94c4ca94cf5f7ec142199ab88fcf4783931..b428fa64b5660fa957566d7c790b7090257bbb08 100644 (file)
--- a/gcc/testsuite/gfortran.dg/transfer_simplify_2.f90
+++ b/gcc/testsuite/gfortran.dg/transfer_simplify_2.f90
@@ -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);