diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index d6a22d13451..86adb81da32 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -892,29 +892,32 @@ match_clist_expr (gfc_expr **result, gfc_typespec *ts, gfc_array_spec *as)
   /* Set up expr as an array constructor. */
   if (!scalar)
     {
       expr = gfc_get_array_expr (ts->type, ts->kind, &where);
       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.  */
       gcc_assert (gfc_array_size (expr, &cons_size));
       cmp = mpz_cmp (cons_size, as_size);
       if (cmp < 0)
 	gfc_error ("Not enough elements in array initializer at %C");
       else if (cmp > 0)
 	gfc_error ("Too many elements in array initializer at %C");
       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. */
   else if (!gfc_compare_types (&expr->ts, ts)
            && !gfc_convert_type (expr, ts, 1))
     goto cleanup;