Skip to content

Commit 620e4a8

Browse files
klauslerklausler
committed
[flang] Static checking for empty coarrays
A coarray must not have a zero extent on a codimension; that would yield an empty coarray. When cobounds are constants, verify them.
1 parent f6e8366 commit 620e4a8

File tree

6 files changed

+195
-126
lines changed

6 files changed

+195
-126
lines changed

‎flang/include/flang/Semantics/expression.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@ class ExpressionAnalyzer {
342342
const semantics::Scope &, bool C919bAlreadyEnforced = false);
343343
MaybeExpr CompleteSubscripts(ArrayRef &&);
344344
MaybeExpr ApplySubscripts(DataRef &&, std::vector<Subscript> &&);
345-
void CheckSubscripts(ArrayRef &);
346345
bool CheckRanks(const DataRef &); // Return false if error exists.
347346
bool CheckPolymorphic(const DataRef &); // ditto
348347
bool CheckDataRef(const DataRef &); // ditto

‎flang/lib/Semantics/check-allocate.cpp‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,10 @@ class AllocationCheckerHelper {
3939
public:
4040
AllocationCheckerHelper(
4141
const parser::Allocation &alloc, AllocateCheckerInfo &info)
42-
: allocateInfo_{info}, allocateObject_{std::get<parser::AllocateObject>(
43-
alloc.t)},
44-
allocateShapeSpecRank_{ShapeSpecRank(alloc)}, allocateCoarraySpecRank_{
45-
CoarraySpecRank(
46-
alloc)} {}
42+
: allocateInfo_{info}, allocation_{alloc},
43+
allocateObject_{std::get<parser::AllocateObject>(alloc.t)},
44+
allocateShapeSpecRank_{ShapeSpecRank(alloc)},
45+
allocateCoarraySpecRank_{CoarraySpecRank(alloc)} {}
4746

4847
bool RunChecks(SemanticsContext &context);
4948

@@ -84,6 +83,7 @@ class AllocationCheckerHelper {
8483
}
8584

8685
AllocateCheckerInfo &allocateInfo_;
86+
const parser::Allocation &allocation_;
8787
const parser::AllocateObject &allocateObject_;
8888
const int allocateShapeSpecRank_{0};
8989
const int allocateCoarraySpecRank_{0};
@@ -693,6 +693,31 @@ bool AllocationCheckerHelper::RunCoarrayRelatedChecks(
693693
corank_);
694694
return false;
695695
}
696+
if (const auto &coarraySpec{
697+
std::get<std::optional<parser::AllocateCoarraySpec>>(
698+
allocation_.t)}) {
699+
int dim{0};
700+
for (const auto &spec :
701+
std::get<std::list<parser::AllocateCoshapeSpec>>(coarraySpec->t)) {
702+
if (auto ubv{evaluate::ToInt64(
703+
GetExpr(context, std::get<parser::BoundExpr>(spec.t)))}) {
704+
if (auto *lbx{GetExpr(context,
705+
std::get<std::optional<parser::BoundExpr>>(spec.t))}) {
706+
auto lbv{evaluate::ToInt64(*lbx)};
707+
if (lbv && *ubv < *lbv) {
708+
context.Say(name_.source,
709+
"Upper cobound %jd is less than lower cobound %jd of codimension %d"_err_en_US,
710+
std::intmax_t{*ubv}, std::intmax_t{*lbv}, dim + 1);
711+
}
712+
} else if (*ubv < 1) {
713+
context.Say(name_.source,
714+
"Upper cobound %jd of codimension %d is less than 1"_err_en_US,
715+
std::intmax_t{*ubv}, dim + 1);
716+
}
717+
}
718+
++dim;
719+
}
720+
}
696721
}
697722
} else { // Not a coarray
698723
if (hasAllocateCoarraySpec()) {

‎flang/lib/Semantics/expression.cpp‎

Lines changed: 151 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -265,102 +265,42 @@ MaybeExpr ExpressionAnalyzer::Designate(DataRef &&ref) {
265265
}
266266
}
267267

268-
// Some subscript semantic checks must be deferred until all of the
269-
// subscripts are in hand.
270-
MaybeExpr ExpressionAnalyzer::CompleteSubscripts(ArrayRef &&ref) {
271-
const Symbol &symbol{ref.GetLastSymbol().GetUltimate()};
272-
int symbolRank{symbol.Rank()};
273-
int subscripts{static_cast<int>(ref.size())};
274-
if (subscripts == 0) {
275-
return std::nullopt; // error recovery
276-
} else if (subscripts != symbolRank) {
277-
if (symbolRank != 0) {
278-
Say("Reference to rank-%d object '%s' has %d subscripts"_err_en_US,
279-
symbolRank, symbol.name(), subscripts);
280-
}
281-
return std::nullopt;
282-
} else if (symbol.has<semantics::ObjectEntityDetails>() ||
283-
symbol.has<semantics::AssocEntityDetails>()) {
284-
// C928 & C1002
285-
if (Triplet *last{std::get_if<Triplet>(&ref.subscript().back().u)}) {
286-
if (!last->upper() && IsAssumedSizeArray(symbol)) {
287-
Say("Assumed-size array '%s' must have explicit final "
288-
"subscript upper bound value"_err_en_US,
289-
symbol.name());
290-
return std::nullopt;
291-
}
292-
}
293-
} else {
294-
// Shouldn't get here from Analyze(ArrayElement) without a valid base,
295-
// which, if not an object, must be a construct entity from
296-
// SELECT TYPE/RANK or ASSOCIATE.
297-
CHECK(symbol.has<semantics::AssocEntityDetails>());
298-
}
299-
if (!semantics::IsNamedConstant(symbol) && !inDataStmtObject_) {
300-
// Subscripts of named constants are checked in folding.
301-
// Subscripts of DATA statement objects are checked in data statement
302-
// conversion to initializers.
303-
CheckSubscripts(ref);
304-
}
305-
return Designate(DataRef{std::move(ref)});
306-
}
307-
308-
// Applies subscripts to a data reference.
309-
MaybeExpr ExpressionAnalyzer::ApplySubscripts(
310-
DataRef &&dataRef, std::vector<Subscript> &&subscripts) {
311-
if (subscripts.empty()) {
312-
return std::nullopt; // error recovery
313-
}
314-
return common::visit(
315-
common::visitors{
316-
[&](SymbolRef &&symbol) {
317-
return CompleteSubscripts(ArrayRef{symbol, std::move(subscripts)});
318-
},
319-
[&](Component &&c) {
320-
return CompleteSubscripts(
321-
ArrayRef{std::move(c), std::move(subscripts)});
322-
},
323-
[&](auto &&) -> MaybeExpr {
324-
DIE("bad base for ArrayRef");
325-
return std::nullopt;
326-
},
327-
},
328-
std::move(dataRef.u));
329-
}
330-
331-
void ExpressionAnalyzer::CheckSubscripts(ArrayRef &ref) {
332-
// Fold subscript expressions and check for an empty triplet.
333-
const Symbol &arraySymbol{ref.base().GetLastSymbol()};
334-
Shape lb{GetLBOUNDs(foldingContext_, NamedEntity{arraySymbol})};
335-
CHECK(lb.size() >= ref.subscript().size());
336-
Shape ub{GetUBOUNDs(foldingContext_, NamedEntity{arraySymbol})};
337-
CHECK(ub.size() >= ref.subscript().size());
268+
// Returns false if any dimension could be empty (e.g. A(1:0)) or has an error
269+
static bool FoldSubscripts(semantics::SemanticsContext &context,
270+
const Symbol &arraySymbol, std::vector<Subscript> &subscripts, Shape &lb,
271+
Shape &ub) {
272+
FoldingContext &foldingContext{context.foldingContext()};
273+
lb = GetLBOUNDs(foldingContext, NamedEntity{arraySymbol});
274+
CHECK(lb.size() >= subscripts.size());
275+
ub = GetUBOUNDs(foldingContext, NamedEntity{arraySymbol});
276+
CHECK(ub.size() >= subscripts.size());
338277
bool anyPossiblyEmptyDim{false};
339278
int dim{0};
340-
for (Subscript &ss : ref.subscript()) {
279+
for (Subscript &ss : subscripts) {
341280
if (Triplet * triplet{std::get_if<Triplet>(&ss.u)}) {
342-
auto expr{Fold(triplet->stride())};
281+
auto expr{Fold(foldingContext, triplet->stride())};
343282
auto stride{ToInt64(expr)};
344283
triplet->set_stride(std::move(expr));
345284
std::optional<ConstantSubscript> lower, upper;
346285
if (auto expr{triplet->lower()}) {
347-
*expr = Fold(std::move(*expr));
286+
*expr = Fold(foldingContext, std::move(*expr));
348287
lower = ToInt64(*expr);
349288
triplet->set_lower(std::move(*expr));
350289
} else {
351290
lower = ToInt64(lb[dim]);
352291
}
353292
if (auto expr{triplet->upper()}) {
354-
*expr = Fold(std::move(*expr));
293+
*expr = Fold(foldingContext, std::move(*expr));
355294
upper = ToInt64(*expr);
356295
triplet->set_upper(std::move(*expr));
357296
} else {
358297
upper = ToInt64(ub[dim]);
359298
}
360299
if (stride) {
361300
if (*stride == 0) {
362-
Say("Stride of triplet must not be zero"_err_en_US);
363-
return;
301+
foldingContext.messages().Say(
302+
"Stride of triplet must not be zero"_err_en_US);
303+
return false; // error
364304
}
365305
if (lower && upper) {
366306
if (*stride > 0) {
@@ -380,21 +320,53 @@ void ExpressionAnalyzer::CheckSubscripts(ArrayRef &ref) {
380320
}
381321
} else { // not triplet
382322
auto &expr{std::get<IndirectSubscriptIntegerExpr>(ss.u).value()};
383-
expr = Fold(std::move(expr));
323+
expr = Fold(foldingContext, std::move(expr));
384324
anyPossiblyEmptyDim |= expr.Rank() > 0; // vector subscript
385325
}
386326
++dim;
387327
}
388-
if (anyPossiblyEmptyDim) {
389-
return;
328+
return !anyPossiblyEmptyDim;
329+
}
330+
331+
static void ValidateSubscriptValue(parser::ContextualMessages &messages,
332+
const Symbol &symbol, ConstantSubscript val,
333+
std::optional<ConstantSubscript> lb, std::optional<ConstantSubscript> ub,
334+
int dim, const char *co = "") {
335+
std::optional<parser::MessageFixedText> msg;
336+
std::optional<ConstantSubscript> bound;
337+
if (lb && val < *lb) {
338+
msg =
339+
"%ssubscript %jd is less than lower %sbound %jd for %sdimension %d of array"_err_en_US;
340+
bound = *lb;
341+
} else if (ub && val > *ub) {
342+
msg =
343+
"%ssubscript %jd is greater than upper %sbound %jd for %sdimension %d of array"_err_en_US;
344+
bound = *ub;
345+
if (dim + 1 == symbol.Rank() && IsDummy(symbol) && *bound == 1) {
346+
// Old-school overindexing of a dummy array isn't fatal when
347+
// it's on the last dimension and the extent is 1.
348+
msg->set_severity(parser::Severity::Warning);
349+
}
350+
}
351+
if (msg) {
352+
AttachDeclaration(
353+
messages.Say(std::move(*msg), co, static_cast<std::intmax_t>(val), co,
354+
static_cast<std::intmax_t>(bound.value()), co, dim + 1),
355+
symbol);
390356
}
391-
dim = 0;
392-
for (Subscript &ss : ref.subscript()) {
357+
}
358+
359+
static void ValidateSubscripts(semantics::SemanticsContext &context,
360+
const Symbol &arraySymbol, const std::vector<Subscript> &subscripts,
361+
const Shape &lb, const Shape &ub) {
362+
int dim{0};
363+
for (const Subscript &ss : subscripts) {
393364
auto dimLB{ToInt64(lb[dim])};
394365
auto dimUB{ToInt64(ub[dim])};
395366
if (dimUB && dimLB && *dimUB < *dimLB) {
396367
AttachDeclaration(
397-
Warn(common::UsageWarning::SubscriptedEmptyArray,
368+
context.Warn(common::UsageWarning::SubscriptedEmptyArray,
369+
context.foldingContext().messages().at(),
398370
"Empty array dimension %d should not be subscripted as an element or non-empty array section"_err_en_US,
399371
dim + 1),
400372
arraySymbol);
@@ -429,35 +401,105 @@ void ExpressionAnalyzer::CheckSubscripts(ArrayRef &ref) {
429401
}
430402
for (int j{0}; j < vals; ++j) {
431403
if (val[j]) {
432-
std::optional<parser::MessageFixedText> msg;
433-
std::optional<ConstantSubscript> bound;
434-
if (dimLB && *val[j] < *dimLB) {
435-
msg =
436-
"Subscript %jd is less than lower bound %jd for dimension %d of array"_err_en_US;
437-
bound = *dimLB;
438-
} else if (dimUB && *val[j] > *dimUB) {
439-
msg =
440-
"Subscript %jd is greater than upper bound %jd for dimension %d of array"_err_en_US;
441-
bound = *dimUB;
442-
if (dim + 1 == arraySymbol.Rank() && IsDummy(arraySymbol) &&
443-
*bound == 1) {
444-
// Old-school overindexing of a dummy array isn't fatal when
445-
// it's on the last dimension and the extent is 1.
446-
msg->set_severity(parser::Severity::Warning);
447-
}
448-
}
449-
if (msg) {
450-
AttachDeclaration(
451-
Say(std::move(*msg), static_cast<std::intmax_t>(*val[j]),
452-
static_cast<std::intmax_t>(bound.value()), dim + 1),
453-
arraySymbol);
454-
}
404+
ValidateSubscriptValue(context.foldingContext().messages(), arraySymbol,
405+
*val[j], dimLB, dimUB, dim);
455406
}
456407
}
457408
++dim;
458409
}
459410
}
460411

412+
static void CheckSubscripts(
413+
semantics::SemanticsContext &context, ArrayRef &ref) {
414+
const Symbol &arraySymbol{ref.base().GetLastSymbol()};
415+
Shape lb, ub;
416+
if (FoldSubscripts(context, arraySymbol, ref.subscript(), lb, ub)) {
417+
ValidateSubscripts(context, arraySymbol, ref.subscript(), lb, ub);
418+
}
419+
}
420+
421+
static void CheckSubscripts(
422+
semantics::SemanticsContext &context, CoarrayRef &ref) {
423+
const Symbol &coarraySymbol{ref.GetBase().GetLastSymbol()};
424+
Shape lb, ub;
425+
if (FoldSubscripts(context, coarraySymbol, ref.subscript(), lb, ub)) {
426+
ValidateSubscripts(context, coarraySymbol, ref.subscript(), lb, ub);
427+
}
428+
FoldingContext &foldingContext{context.foldingContext()};
429+
int dim{0};
430+
for (auto &expr : ref.cosubscript()) {
431+
expr = Fold(foldingContext, std::move(expr));
432+
if (auto val{ToInt64(expr)}) {
433+
ValidateSubscriptValue(foldingContext.messages(), coarraySymbol, *val,
434+
ToInt64(GetLCOBOUND(coarraySymbol, dim)),
435+
ToInt64(GetUCOBOUND(coarraySymbol, dim)), dim, "co");
436+
}
437+
++dim;
438+
}
439+
}
440+
441+
// Some subscript semantic checks must be deferred until all of the
442+
// subscripts are in hand.
443+
MaybeExpr ExpressionAnalyzer::CompleteSubscripts(ArrayRef &&ref) {
444+
const Symbol &symbol{ref.GetLastSymbol().GetUltimate()};
445+
int symbolRank{symbol.Rank()};
446+
int subscripts{static_cast<int>(ref.size())};
447+
if (subscripts == 0) {
448+
return std::nullopt; // error recovery
449+
} else if (subscripts != symbolRank) {
450+
if (symbolRank != 0) {
451+
Say("Reference to rank-%d object '%s' has %d subscripts"_err_en_US,
452+
symbolRank, symbol.name(), subscripts);
453+
}
454+
return std::nullopt;
455+
} else if (symbol.has<semantics::ObjectEntityDetails>() ||
456+
symbol.has<semantics::AssocEntityDetails>()) {
457+
// C928 & C1002
458+
if (Triplet * last{std::get_if<Triplet>(&ref.subscript().back().u)}) {
459+
if (!last->upper() && IsAssumedSizeArray(symbol)) {
460+
Say("Assumed-size array '%s' must have explicit final subscript upper bound value"_err_en_US,
461+
symbol.name());
462+
return std::nullopt;
463+
}
464+
}
465+
} else {
466+
// Shouldn't get here from Analyze(ArrayElement) without a valid base,
467+
// which, if not an object, must be a construct entity from
468+
// SELECT TYPE/RANK or ASSOCIATE.
469+
CHECK(symbol.has<semantics::AssocEntityDetails>());
470+
}
471+
if (!semantics::IsNamedConstant(symbol) && !inDataStmtObject_) {
472+
// Subscripts of named constants are checked in folding.
473+
// Subscripts of DATA statement objects are checked in data statement
474+
// conversion to initializers.
475+
CheckSubscripts(context_, ref);
476+
}
477+
return Designate(DataRef{std::move(ref)});
478+
}
479+
480+
// Applies subscripts to a data reference.
481+
MaybeExpr ExpressionAnalyzer::ApplySubscripts(
482+
DataRef &&dataRef, std::vector<Subscript> &&subscripts) {
483+
if (subscripts.empty()) {
484+
return std::nullopt; // error recovery
485+
}
486+
return common::visit(common::visitors{
487+
[&](SymbolRef &&symbol) {
488+
return CompleteSubscripts(
489+
ArrayRef{symbol, std::move(subscripts)});
490+
},
491+
[&](Component &&c) {
492+
return CompleteSubscripts(
493+
ArrayRef{std::move(c), std::move(subscripts)});
494+
},
495+
[&](auto &&) -> MaybeExpr {
496+
DIE("bad base for ArrayRef");
497+
return std::nullopt;
498+
},
499+
},
500+
std::move(dataRef.u));
501+
}
502+
461503
// C919a - only one part-ref of a data-ref may have rank > 0
462504
bool ExpressionAnalyzer::CheckRanks(const DataRef &dataRef) {
463505
return common::visit(
@@ -1524,9 +1566,10 @@ MaybeExpr ExpressionAnalyzer::Analyze(const parser::CoindexedNamedObject &x) {
15241566
// Reverse the chain of symbols so that the base is first and coarray
15251567
// ultimate component is last.
15261568
if (cosubsOk) {
1527-
return Designate(
1528-
DataRef{CoarrayRef{SymbolVector{reversed.crbegin(), reversed.crend()},
1529-
std::move(subscripts), std::move(cosubscripts)}});
1569+
CoarrayRef coarrayRef{SymbolVector{reversed.crbegin(), reversed.crend()},
1570+
std::move(subscripts), std::move(cosubscripts)};
1571+
CheckSubscripts(context_, coarrayRef);
1572+
return Designate(DataRef{std::move(coarrayRef)});
15301573
}
15311574
}
15321575
return std::nullopt;

‎flang/test/Semantics/allocate12.f90‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ subroutine C941_C942b_C950(xsrc, x1, a2, b2, cx1, ca2, cb1, cb2, c1, c2)
112112
! Valid construct
113113
allocate(c1%ct2(2,5)%t1(2)%t0%array(10))
114114

115+
!ERROR: cosubscript 2 is less than lower cobound 5 for codimension 1 of array
115116
!ERROR: Allocatable object must not be coindexed in ALLOCATE
116117
allocate(b1%x, b2(1)%x, cb1[2]%x, SOURCE=xsrc)
117118
!ERROR: Allocatable object must not be coindexed in ALLOCATE

0 commit comments

Comments
 (0)