diff --git a/flang/lib/Evaluate/fold-designator.cpp b/flang/lib/Evaluate/fold-designator.cpp --- a/flang/lib/Evaluate/fold-designator.cpp +++ b/flang/lib/Evaluate/fold-designator.cpp @@ -90,6 +90,8 @@ result->Augment((at - lower) * stride); which = quotient; return true; + } else { + isEmpty_ = true; } } return false; @@ -100,16 +102,20 @@ auto end{ToInt64(Fold(context_, triplet.upper().value_or(ExtentExpr{upper})))}; auto step{ToInt64(Fold(context_, triplet.stride()))}; - if (start && end && step && *step != 0) { - ConstantSubscript range{ - (*end - *start + *step) / *step}; - if (range > 0) { - auto quotient{which / range}; - auto remainder{which - range * quotient}; - auto j{*start + remainder * *step}; - result->Augment((j - lower) * stride); - which = quotient; - return true; + if (start && end && step) { + if (*step != 0) { + ConstantSubscript range{ + (*end - *start + *step) / *step}; + if (range > 0) { + auto quotient{which / range}; + auto remainder{which - range * quotient}; + auto j{*start + remainder * *step}; + result->Augment((j - lower) * stride); + which = quotient; + return true; + } else { + isEmpty_ = true; + } } } return false; diff --git a/flang/test/Semantics/data05.f90 b/flang/test/Semantics/data05.f90 --- a/flang/test/Semantics/data05.f90 +++ b/flang/test/Semantics/data05.f90 @@ -89,4 +89,8 @@ procedure(rfunc), pointer :: pp ! CHECK: pp, EXTERNAL, POINTER (Function, InDataStmt) size=8 offset=0: ProcEntity rfunc => rfunc2 data pp/rfunc2/ end subroutine + subroutine s13 + integer j(2) + data j(2:1), j(1:2) /1,2/ ! CHECK: j (InDataStmt) size=8 offset=0: ObjectEntity type: INTEGER(4) shape: 1_8:2_8 init:[INTEGER(4)::1_4,2_4] + end subroutine end module