diff --git a/flang/lib/Semantics/expression.cpp b/flang/lib/Semantics/expression.cpp index 2202639a92e43d..897e94966a1343 100644 --- a/flang/lib/Semantics/expression.cpp +++ b/flang/lib/Semantics/expression.cpp @@ -1584,7 +1584,8 @@ class ArrayConstructorContext { std::optional> LengthIfGood() const { if (type_) { auto len{type_->LEN()}; - if (len && IsConstantExpr(*len) && !ContainsAnyImpliedDoIndex(*len)) { + if (explicitType_ || + (len && IsConstantExpr(*len) && !ContainsAnyImpliedDoIndex(*len))) { return len; } } diff --git a/flang/test/Lower/HLFIR/array-ctor-character.f90 b/flang/test/Lower/HLFIR/array-ctor-character.f90 index 85e6ed27fe0774..881085b370ffef 100644 --- a/flang/test/Lower/HLFIR/array-ctor-character.f90 +++ b/flang/test/Lower/HLFIR/array-ctor-character.f90 @@ -93,10 +93,11 @@ subroutine test_set_length_sanitize(i, c1) call takes_char([character(len=i):: c1]) end subroutine ! CHECK-LABEL: func.func @_QPtest_set_length_sanitize( -! CHECK: %[[VAL_6:.*]]:2 = hlfir.declare {{.*}}Ec1 -! CHECK: %[[VAL_9:.*]]:2 = hlfir.declare {{.*}}Ei -! CHECK: %[[VAL_25:.*]] = fir.load %[[VAL_9]]#0 : !fir.ref +! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare {{.*}}Ec1 +! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %arg0 +! CHECK: %[[VAL_4:.*]] = fir.load %[[VAL_3]]#0 : !fir.ref +! CHECK: %[[VAL_25:.*]] = fir.load %[[VAL_3]]#0 : !fir.ref ! CHECK: %[[VAL_26:.*]] = arith.constant 0 : i64 ! CHECK: %[[VAL_27:.*]] = arith.cmpi sgt, %[[VAL_25]], %[[VAL_26]] : i64 ! CHECK: %[[VAL_28:.*]] = arith.select %[[VAL_27]], %[[VAL_25]], %[[VAL_26]] : i64 -! CHECK: %[[VAL_29:.*]] = hlfir.set_length %[[VAL_6]]#0 len %[[VAL_28]] : (!fir.boxchar<1>, i64) -> !hlfir.expr> +! CHECK: %[[VAL_29:.*]] = hlfir.set_length %[[VAL_2]]#0 len %[[VAL_28]] : (!fir.boxchar<1>, i64) -> !hlfir.expr> diff --git a/flang/test/Semantics/array-constr-len.f90 b/flang/test/Semantics/array-constr-len.f90 index a785c9e2ece6d0..4de9c76c7041c2 100644 --- a/flang/test/Semantics/array-constr-len.f90 +++ b/flang/test/Semantics/array-constr-len.f90 @@ -10,6 +10,5 @@ subroutine subr(s,n) print *, [(s(1:j),j=1,0)] print *, [(s(1:1),j=1,0)] ! ok print *, [character(2)::(s(1:n),j=1,0)] ! ok - !ERROR: Array constructor implied DO loop has no iterations and indeterminate character length print *, [character(n)::(s(1:n),j=1,0)] end