[flang] Revamp evaluate::CoarrayRef #136628
Open
+162
−253
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
flang
|
@llvm/pr-subscribers-flang-fir-hlfir Author: Peter Klausler (klausler) ChangesBring the typed expression representation of a coindexed reference up to F'2023, which removed some restrictions that had allowed the current representation to suffice for older revisions of the language. This new representation is somewhat more simple -- it uses a DataRef as its base, so any subscripts in a part-ref can be represented as an ArrayRef there. Update the code that creates the CoarrayRef, and add more checking to it, as well as actually capturing any STAT=, TEAM=, & TEAM_NUMBER= specifiers that might appear. Enforce the constraint that the part-ref must have subscripts if it is an array. (And update a pile of copied-and-pasted test code that lacked such subscripts.) Patch is 38.32 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/136628.diff 29 Files Affected:
diff --git a/flang/include/flang/Evaluate/tools.h b/flang/include/flang/Evaluate/tools.h
index 1414eaf14f7d6..650c5b2163f63 100644
--- a/flang/include/flang/Evaluate/tools.h
+++ b/flang/include/flang/Evaluate/tools.h
@@ -391,20 +391,17 @@ template <typename T>
bool IsArrayElement(const Expr<T> &expr, bool intoSubstring = true,
bool skipComponents = false) {
if (auto dataRef{ExtractDataRef(expr, intoSubstring)}) {
- const DataRef *ref{&*dataRef};
- if (skipComponents) {
- while (const Component * component{std::get_if<Component>(&ref->u)}) {
- ref = &component->base();
+ for (const DataRef *ref{&*dataRef}; ref;) {
+ if (const Component *component{std::get_if<Component>(&ref->u)}) {
+ ref = skipComponents ? &component->base() : nullptr;
+ } else if (const auto *coarrayRef{std::get_if<CoarrayRef>(&ref->u)}) {
+ ref = &coarrayRef->base();
+ } else {
+ return std::holds_alternative<ArrayRef>(ref->u);
}
}
- if (const auto *coarrayRef{std::get_if<CoarrayRef>(&ref->u)}) {
- return !coarrayRef->subscript().empty();
- } else {
- return std::holds_alternative<ArrayRef>(ref->u);
- }
- } else {
- return false;
}
+ return false;
}
template <typename A>
@@ -418,9 +415,6 @@ std::optional<NamedEntity> ExtractNamedEntity(const A &x) {
[](Component &&component) -> std::optional<NamedEntity> {
return NamedEntity{std::move(component)};
},
- [](CoarrayRef &&co) -> std::optional<NamedEntity> {
- return co.GetBase();
- },
[](auto &&) { return std::optional<NamedEntity>{}; },
},
std::move(dataRef->u));
@@ -528,22 +522,14 @@ const Symbol *UnwrapWholeSymbolOrComponentDataRef(const A &x) {
// If an expression is a whole symbol or a whole component designator,
// potentially followed by an image selector, extract and return that symbol,
// else null.
+const Symbol *UnwrapWholeSymbolOrComponentOrCoarrayRef(const DataRef &);
template <typename A>
const Symbol *UnwrapWholeSymbolOrComponentOrCoarrayRef(const A &x) {
if (auto dataRef{ExtractDataRef(x)}) {
- if (const SymbolRef * p{std::get_if<SymbolRef>(&dataRef->u)}) {
- return &p->get();
- } else if (const Component * c{std::get_if<Component>(&dataRef->u)}) {
- if (c->base().Rank() == 0) {
- return &c->GetLastSymbol();
- }
- } else if (const CoarrayRef * c{std::get_if<CoarrayRef>(&dataRef->u)}) {
- if (c->subscript().empty()) {
- return &c->GetLastSymbol();
- }
- }
+ return UnwrapWholeSymbolOrComponentOrCoarrayRef(*dataRef);
+ } else {
+ return nullptr;
}
- return nullptr;
}
// GetFirstSymbol(A%B%C[I]%D) -> A
diff --git a/flang/include/flang/Evaluate/traverse.h b/flang/include/flang/Evaluate/traverse.h
index 45402143604f4..48aafa8982559 100644
--- a/flang/include/flang/Evaluate/traverse.h
+++ b/flang/include/flang/Evaluate/traverse.h
@@ -146,8 +146,7 @@ class Traverse {
return Combine(x.base(), x.subscript());
}
Result operator()(const CoarrayRef &x) const {
- return Combine(
- x.base(), x.subscript(), x.cosubscript(), x.stat(), x.team());
+ return Combine(x.base(), x.cosubscript(), x.stat(), x.team());
}
Result operator()(const DataRef &x) const { return visitor_(x.u); }
Result operator()(const Substring &x) const {
diff --git a/flang/include/flang/Evaluate/variable.h b/flang/include/flang/Evaluate/variable.h
index 7f1518fd26e78..5c14421fd3a1b 100644
--- a/flang/include/flang/Evaluate/variable.h
+++ b/flang/include/flang/Evaluate/variable.h
@@ -98,8 +98,6 @@ class Component {
// A NamedEntity is either a whole Symbol or a component in an instance
// of a derived type. It may be a descriptor.
-// TODO: this is basically a symbol with an optional DataRef base;
-// could be used to replace Component.
class NamedEntity {
public:
CLASS_BOILERPLATE(NamedEntity)
@@ -239,28 +237,16 @@ class ArrayRef {
std::vector<Subscript> subscript_;
};
-// R914 coindexed-named-object
-// R924 image-selector, R926 image-selector-spec.
-// C825 severely limits the usage of derived types with coarray ultimate
-// components: they can't be pointers, allocatables, arrays, coarrays, or
-// function results. They can be components of other derived types.
-// Although the F'2018 Standard never prohibits multiple image-selectors
-// per se in the same data-ref or designator, nor the presence of an
-// image-selector after a part-ref with rank, the constraints on the
-// derived types that would have be involved make it impossible to declare
-// an object that could be referenced in these ways (esp. C748 & C825).
-// C930 precludes having both TEAM= and TEAM_NUMBER=.
-// TODO C931 prohibits the use of a coindexed object as a stat-variable.
+// A coindexed data-ref. The base is represented as a general
+// DataRef, but the base may not contain a CoarrayRef and may
+// have rank > 0 only in an uppermost ArrayRef.
class CoarrayRef {
public:
CLASS_BOILERPLATE(CoarrayRef)
- CoarrayRef(SymbolVector &&, std::vector<Subscript> &&,
- std::vector<Expr<SubscriptInteger>> &&);
+ CoarrayRef(DataRef &&, std::vector<Expr<SubscriptInteger>> &&);
- const SymbolVector &base() const { return base_; }
- SymbolVector &base() { return base_; }
- const std::vector<Subscript> &subscript() const { return subscript_; }
- std::vector<Subscript> &subscript() { return subscript_; }
+ const DataRef &base() const { return base_.value(); }
+ DataRef &base() { return base_.value(); }
const std::vector<Expr<SubscriptInteger>> &cosubscript() const {
return cosubscript_;
}
@@ -270,25 +256,24 @@ class CoarrayRef {
// (i.e., Designator or pointer-valued FunctionRef).
std::optional<Expr<SomeInteger>> stat() const;
CoarrayRef &set_stat(Expr<SomeInteger> &&);
- std::optional<Expr<SomeInteger>> team() const;
- bool teamIsTeamNumber() const { return teamIsTeamNumber_; }
- CoarrayRef &set_team(Expr<SomeInteger> &&, bool isTeamNumber = false);
+ // When team() is Expr<SomeInteger>, it's TEAM_NUMBER=; otherwise,
+ // it's TEAM=.
+ std::optional<Expr<SomeType>> team() const;
+ CoarrayRef &set_team(Expr<SomeType> &&);
int Rank() const;
int Corank() const { return 0; }
const Symbol &GetFirstSymbol() const;
const Symbol &GetLastSymbol() const;
- NamedEntity GetBase() const;
std::optional<Expr<SubscriptInteger>> LEN() const;
bool operator==(const CoarrayRef &) const;
llvm::raw_ostream &AsFortran(llvm::raw_ostream &) const;
private:
- SymbolVector base_;
- std::vector<Subscript> subscript_;
+ common::CopyableIndirection<DataRef> base_;
std::vector<Expr<SubscriptInteger>> cosubscript_;
- std::optional<common::CopyableIndirection<Expr<SomeInteger>>> stat_, team_;
- bool teamIsTeamNumber_{false}; // false: TEAM=, true: TEAM_NUMBER=
+ std::optional<common::CopyableIndirection<Expr<SomeInteger>>> stat_;
+ std::optional<common::CopyableIndirection<Expr<SomeType>>> team_;
};
// R911 data-ref is defined syntactically as a series of part-refs, which
diff --git a/flang/lib/Evaluate/check-expression.cpp b/flang/lib/Evaluate/check-expression.cpp
index d8baaf2e2a7ac..3d7f01d56c465 100644
--- a/flang/lib/Evaluate/check-expression.cpp
+++ b/flang/lib/Evaluate/check-expression.cpp
@@ -946,10 +946,7 @@ class IsContiguousHelper
return std::nullopt;
}
}
- Result operator()(const CoarrayRef &x) const {
- int rank{0};
- return CheckSubscripts(x.subscript(), rank).has_value();
- }
+ Result operator()(const CoarrayRef &x) const { return (*this)(x.base()); }
Result operator()(const Component &x) const {
if (x.base().Rank() == 0) {
return (*this)(x.GetLastSymbol());
diff --git a/flang/lib/Evaluate/fold.cpp b/flang/lib/Evaluate/fold.cpp
index 5fc31728ce5d6..45e842abf589f 100644
--- a/flang/lib/Evaluate/fold.cpp
+++ b/flang/lib/Evaluate/fold.cpp
@@ -162,22 +162,17 @@ ArrayRef FoldOperation(FoldingContext &context, ArrayRef &&arrayRef) {
}
CoarrayRef FoldOperation(FoldingContext &context, CoarrayRef &&coarrayRef) {
- std::vector<Subscript> subscript;
- for (Subscript x : coarrayRef.subscript()) {
- subscript.emplace_back(FoldOperation(context, std::move(x)));
- }
+ DataRef base{FoldOperation(context, std::move(coarrayRef.base()))};
std::vector<Expr<SubscriptInteger>> cosubscript;
for (Expr<SubscriptInteger> x : coarrayRef.cosubscript()) {
cosubscript.emplace_back(Fold(context, std::move(x)));
}
- CoarrayRef folded{std::move(coarrayRef.base()), std::move(subscript),
- std::move(cosubscript)};
+ CoarrayRef folded{std::move(base), std::move(cosubscript)};
if (std::optional<Expr<SomeInteger>> stat{coarrayRef.stat()}) {
folded.set_stat(Fold(context, std::move(*stat)));
}
- if (std::optional<Expr<SomeInteger>> team{coarrayRef.team()}) {
- folded.set_team(
- Fold(context, std::move(*team)), coarrayRef.teamIsTeamNumber());
+ if (std::optional<Expr<SomeType>> team{coarrayRef.team()}) {
+ folded.set_team(Fold(context, std::move(*team)));
}
return folded;
}
diff --git a/flang/lib/Evaluate/formatting.cpp b/flang/lib/Evaluate/formatting.cpp
index 6778fac9a44fd..121afc6f0f8bf 100644
--- a/flang/lib/Evaluate/formatting.cpp
+++ b/flang/lib/Evaluate/formatting.cpp
@@ -723,24 +723,8 @@ llvm::raw_ostream &ArrayRef::AsFortran(llvm::raw_ostream &o) const {
}
llvm::raw_ostream &CoarrayRef::AsFortran(llvm::raw_ostream &o) const {
- bool first{true};
- for (const Symbol &part : base_) {
- if (first) {
- first = false;
- } else {
- o << '%';
- }
- EmitVar(o, part);
- }
- char separator{'('};
- for (const auto &sscript : subscript_) {
- EmitVar(o << separator, sscript);
- separator = ',';
- }
- if (separator == ',') {
- o << ')';
- }
- separator = '[';
+ base().AsFortran(o);
+ char separator{'['};
for (const auto &css : cosubscript_) {
EmitVar(o << separator, css);
separator = ',';
@@ -750,8 +734,10 @@ llvm::raw_ostream &CoarrayRef::AsFortran(llvm::raw_ostream &o) const {
separator = ',';
}
if (team_) {
- EmitVar(
- o << separator, team_, teamIsTeamNumber_ ? "TEAM_NUMBER=" : "TEAM=");
+ EmitVar(o << separator, team_,
+ std::holds_alternative<Expr<SomeInteger>>(team_->value().u)
+ ? "TEAM_NUMBER="
+ : "TEAM=");
}
return o << ']';
}
diff --git a/flang/lib/Evaluate/shape.cpp b/flang/lib/Evaluate/shape.cpp
index f620ecd4a24bb..ac4811e9978eb 100644
--- a/flang/lib/Evaluate/shape.cpp
+++ b/flang/lib/Evaluate/shape.cpp
@@ -891,20 +891,7 @@ auto GetShapeHelper::operator()(const ArrayRef &arrayRef) const -> Result {
}
auto GetShapeHelper::operator()(const CoarrayRef &coarrayRef) const -> Result {
- NamedEntity base{coarrayRef.GetBase()};
- if (coarrayRef.subscript().empty()) {
- return (*this)(base);
- } else {
- Shape shape;
- int dimension{0};
- for (const Subscript &ss : coarrayRef.subscript()) {
- if (ss.Rank() > 0) {
- shape.emplace_back(GetExtent(ss, base, dimension));
- }
- ++dimension;
- }
- return shape;
- }
+ return (*this)(coarrayRef.base());
}
auto GetShapeHelper::operator()(const Substring &substring) const -> Result {
diff --git a/flang/lib/Evaluate/tools.cpp b/flang/lib/Evaluate/tools.cpp
index 702711e3cff53..16e2d6c0f7a55 100644
--- a/flang/lib/Evaluate/tools.cpp
+++ b/flang/lib/Evaluate/tools.cpp
@@ -1090,7 +1090,7 @@ auto GetSymbolVectorHelper::operator()(const ArrayRef &x) const -> Result {
return GetSymbolVector(x.base());
}
auto GetSymbolVectorHelper::operator()(const CoarrayRef &x) const -> Result {
- return x.base();
+ return GetSymbolVector(x.base());
}
const Symbol *GetLastTarget(const SymbolVector &symbols) {
@@ -1320,6 +1320,19 @@ std::optional<parser::MessageFixedText> CheckProcCompatibility(bool isCall,
return msg;
}
+const Symbol *UnwrapWholeSymbolOrComponentOrCoarrayRef(const DataRef &dataRef) {
+ if (const SymbolRef *p{std::get_if<SymbolRef>(&dataRef.u)}) {
+ return &p->get();
+ } else if (const Component *c{std::get_if<Component>(&dataRef.u)}) {
+ if (c->base().Rank() == 0) {
+ return &c->GetLastSymbol();
+ }
+ } else if (const CoarrayRef *c{std::get_if<CoarrayRef>(&dataRef.u)}) {
+ return UnwrapWholeSymbolOrComponentOrCoarrayRef(c->base());
+ }
+ return nullptr;
+}
+
// GetLastPointerSymbol()
static const Symbol *GetLastPointerSymbol(const Symbol &symbol) {
return IsPointer(GetAssociationRoot(symbol)) ? &symbol : nullptr;
diff --git a/flang/lib/Evaluate/variable.cpp b/flang/lib/Evaluate/variable.cpp
index 849194b492053..d1bff03a6ea5f 100644
--- a/flang/lib/Evaluate/variable.cpp
+++ b/flang/lib/Evaluate/variable.cpp
@@ -69,13 +69,9 @@ Triplet &Triplet::set_stride(Expr<SubscriptInteger> &&expr) {
return *this;
}
-CoarrayRef::CoarrayRef(SymbolVector &&base, std::vector<Subscript> &&ss,
- std::vector<Expr<SubscriptInteger>> &&css)
- : base_{std::move(base)}, subscript_(std::move(ss)),
- cosubscript_(std::move(css)) {
- CHECK(!base_.empty());
- CHECK(!cosubscript_.empty());
-}
+CoarrayRef::CoarrayRef(
+ DataRef &&base, std::vector<Expr<SubscriptInteger>> &&css)
+ : base_{std::move(base)}, cosubscript_(std::move(css)) {}
std::optional<Expr<SomeInteger>> CoarrayRef::stat() const {
if (stat_) {
@@ -85,7 +81,7 @@ std::optional<Expr<SomeInteger>> CoarrayRef::stat() const {
}
}
-std::optional<Expr<SomeInteger>> CoarrayRef::team() const {
+std::optional<Expr<SomeType>> CoarrayRef::team() const {
if (team_) {
return team_.value().value();
} else {
@@ -99,16 +95,18 @@ CoarrayRef &CoarrayRef::set_stat(Expr<SomeInteger> &&v) {
return *this;
}
-CoarrayRef &CoarrayRef::set_team(Expr<SomeInteger> &&v, bool isTeamNumber) {
- CHECK(IsVariable(v));
+CoarrayRef &CoarrayRef::set_team(Expr<SomeType> &&v) {
team_.emplace(std::move(v));
- teamIsTeamNumber_ = isTeamNumber;
return *this;
}
-const Symbol &CoarrayRef::GetFirstSymbol() const { return base_.front(); }
+const Symbol &CoarrayRef::GetFirstSymbol() const {
+ return base().GetFirstSymbol();
+}
-const Symbol &CoarrayRef::GetLastSymbol() const { return base_.back(); }
+const Symbol &CoarrayRef::GetLastSymbol() const {
+ return base().GetLastSymbol();
+}
void Substring::SetBounds(std::optional<Expr<SubscriptInteger>> &lower,
std::optional<Expr<SubscriptInteger>> &upper) {
@@ -426,17 +424,7 @@ int ArrayRef::Rank() const {
}
}
-int CoarrayRef::Rank() const {
- if (!subscript_.empty()) {
- int rank{0};
- for (const auto &expr : subscript_) {
- rank += expr.Rank();
- }
- return rank;
- } else {
- return base_.back()->Rank();
- }
-}
+int CoarrayRef::Rank() const { return base().Rank(); }
int DataRef::Rank() const {
return common::visit(common::visitors{
@@ -671,22 +659,6 @@ std::optional<DynamicType> Designator<T>::GetType() const {
return std::nullopt;
}
-static NamedEntity AsNamedEntity(const SymbolVector &x) {
- CHECK(!x.empty());
- NamedEntity result{x.front()};
- int j{0};
- for (const Symbol &symbol : x) {
- if (j++ != 0) {
- DataRef base{result.IsSymbol() ? DataRef{result.GetLastSymbol()}
- : DataRef{result.GetComponent()}};
- result = NamedEntity{Component{std::move(base), symbol}};
- }
- }
- return result;
-}
-
-NamedEntity CoarrayRef::GetBase() const { return AsNamedEntity(base_); }
-
// Equality testing
// For the purposes of comparing type parameter expressions while
@@ -759,9 +731,8 @@ bool ArrayRef::operator==(const ArrayRef &that) const {
return base_ == that.base_ && subscript_ == that.subscript_;
}
bool CoarrayRef::operator==(const CoarrayRef &that) const {
- return base_ == that.base_ && subscript_ == that.subscript_ &&
- cosubscript_ == that.cosubscript_ && stat_ == that.stat_ &&
- team_ == that.team_ && teamIsTeamNumber_ == that.teamIsTeamNumber_;
+ return base_ == that.base_ && cosubscript_ == that.cosubscript_ &&
+ stat_ == that.stat_ && team_ == that.team_;
}
bool DataRef::operator==(const DataRef &that) const {
return TestVariableEquality(*this, that);
diff --git a/flang/lib/Lower/Support/Utils.cpp b/flang/lib/Lower/Support/Utils.cpp
index ed2700c42fc55..668ee31a36bc3 100644
--- a/flang/lib/Lower/Support/Utils.cpp
+++ b/flang/lib/Lower/Support/Utils.cpp
@@ -70,18 +70,12 @@ class HashEvaluateExpr {
return getHashValue(x.base()) * 89u - subs;
}
static unsigned getHashValue(const Fortran::evaluate::CoarrayRef &x) {
- unsigned subs = 1u;
- for (const Fortran::evaluate::Subscript &v : x.subscript())
- subs -= getHashValue(v);
unsigned cosubs = 3u;
for (const Fortran::evaluate::Expr<Fortran::evaluate::SubscriptInteger> &v :
x.cosubscript())
cosubs -= getHashValue(v);
- unsigned syms = 7u;
- for (const Fortran::evaluate::SymbolRef &v : x.base())
- syms += getHashValue(v);
- return syms * 97u - subs - cosubs + getHashValue(x.stat()) + 257u +
- getHashValue(x.team());
+ return getHashValue(x.base()) * 97u - cosubs + getHashValue(x.stat()) +
+ 257u + getHashValue(x.team());
}
static unsigned getHashValue(const Fortran::evaluate::NamedEntity &x) {
if (x.IsSymbol())
@@ -339,7 +333,6 @@ class IsEqualEvaluateExpr {
static bool isEqual(const Fortran::evaluate::CoarrayRef &x,
const Fortran::evaluate::CoarrayRef &y) {
return isEqual(x.base(), y.base()) &&
- isEqual(x.subscript(), y.subscript()) &&
isEqual(x.cosubscript(), y.cosubscript()) &&
isEqual(x.stat(), y.stat()) && isEqual(x.team(), y.team());
}
diff --git a/flang/lib/Semantics/check-coarray.cpp b/flang/lib/Semantics/check-coarray.cpp
index b21e3cd757d6b..0e444f155f116 100644
--- a/flang/lib/Semantics/check-coarray.cpp
+++ b/flang/lib/Semantics/check-coarray.cpp
@@ -373,41 +373,12 @@ void CoarrayChecker::Leave(const parser::CriticalStmt &x) {
}
void CoarrayChecker::Leave(const parser::ImageSelector &imageSelector) {
- haveStat_ = false;
- haveTeam_ = false;
- haveTeamNumber_ = false;
for (const auto &imageSelectorSpec :
std::get<std::list<parser::ImageSelectorSpec>>(imageSelector.t)) {
- if (const auto *team{
- std::get_if<parser::TeamValue>(&imageSelectorSpec.u)}) {
- if (haveTeam_) {
- context_.Say(parser::FindSourceLocation(imageSelectorSpec), // C929
- "TEAM value can only be specified once"_err_en_US);
- }
- CheckTeamType(context_, *team);
- haveTeam_ = true;
- }
if (const auto *stat{std::get_if<parser::ImageSelectorSpec::Stat>(
&imageSelectorSpec.u)}) {
- if (haveStat_) {
- context_.Say(parser::FindSourceLocation(imageSelectorSpec), // C929
- "STAT variable can only be specified once"_err_en_US);
- }
CheckTeamStat(context_, *stat);
- haveStat_ = true;
}
- if (std::get_if<parser::ImageSelectorSpec::Team_Number>(
- &imageSelectorSpec.u)) {
- if (haveTeamNumber_) {
- context_.Say(parser::FindSourceLocation(imageSelectorSpec), // C929
- "TEAM_NUMBER value can only be specified once"_err_en_US);
- }
- haveTeamNumber_ = true;
- }
- }
- if (haveTeam_ && haveTeamNumber_) {
- context_.Say(parser::FindSourceLocation(imageSelector), // C930
- "Cannot specify both TEAM and TEAM_NUMBER"_err_en_US);
}
}
diff --git a/flang/lib/Semantics/check-coarray.h b/flang/lib/Semantics/check-coarray.h
index f156959019383..51de47f123558 100644
--- a/flang/lib/Semantics/check-coarray.h
+++ b/flang/lib/Semantics/check-coarray.h
@@ -37,9 +37,6 @@ class CoarrayChecker : public virtual BaseChecker {
private:
SemanticsContext &context_;
- bool haveStat_;
- bool haveTeam_;
- bool haveTeamNumber_;
void CheckNamesAreDistinct(const std::list<parser::CoarrayAssociation> &);
void Say2(const parser::CharBlock &, parser::MessageFixedText &&,
diff --git a/flang/lib/Semantics/dump-expr.cpp b/flang/lib/Semantics/dump-expr.cpp
index 850904bf897b9..aa0b4e0f03398 100644
--- a/flang/lib/Semantics/dump-expr.cpp
+++ b/flang/lib/Semantics/dump-expr.cpp
@@ -22,7 +22,6 @@ inline const char *DumpEvaluateExpr::GetIndentString() const {
void DumpEvaluateExpr::Show(const evaluate::CoarrayRef &x) {
Indent("coarray ref");
...
[truncated]
|
|
@llvm/pr-subscribers-flang-semantics Author: Peter Klausler (klausler) ChangesBring the typed expression representation of a coindexed reference up to F'2023, which removed some restrictions that had allowed the current representation to suffice for older revisions of the language. This new representation is somewhat more simple -- it uses a DataRef as its base, so any subscripts in a part-ref can be represented as an ArrayRef there. Update the code that creates the CoarrayRef, and add more checking to it, as well as actually capturing any STAT=, TEAM=, & TEAM_NUMBER= specifiers that might appear. Enforce the constraint that the part-ref must have subscripts if it is an array. (And update a pile of copied-and-pasted test code that lacked such subscripts.) Patch is 38.32 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/136628.diff 29 Files Affected:
diff --git a/flang/include/flang/Evaluate/tools.h b/flang/include/flang/Evaluate/tools.h
index 1414eaf14f7d6..650c5b2163f63 100644
--- a/flang/include/flang/Evaluate/tools.h
+++ b/flang/include/flang/Evaluate/tools.h
@@ -391,20 +391,17 @@ template <typename T>
bool IsArrayElement(const Expr<T> &expr, bool intoSubstring = true,
bool skipComponents = false) {
if (auto dataRef{ExtractDataRef(expr, intoSubstring)}) {
- const DataRef *ref{&*dataRef};
- if (skipComponents) {
- while (const Component * component{std::get_if<Component>(&ref->u)}) {
- ref = &component->base();
+ for (const DataRef *ref{&*dataRef}; ref;) {
+ if (const Component *component{std::get_if<Component>(&ref->u)}) {
+ ref = skipComponents ? &component->base() : nullptr;
+ } else if (const auto *coarrayRef{std::get_if<CoarrayRef>(&ref->u)}) {
+ ref = &coarrayRef->base();
+ } else {
+ return std::holds_alternative<ArrayRef>(ref->u);
}
}
- if (const auto *coarrayRef{std::get_if<CoarrayRef>(&ref->u)}) {
- return !coarrayRef->subscript().empty();
- } else {
- return std::holds_alternative<ArrayRef>(ref->u);
- }
- } else {
- return false;
}
+ return false;
}
template <typename A>
@@ -418,9 +415,6 @@ std::optional<NamedEntity> ExtractNamedEntity(const A &x) {
[](Component &&component) -> std::optional<NamedEntity> {
return NamedEntity{std::move(component)};
},
- [](CoarrayRef &&co) -> std::optional<NamedEntity> {
- return co.GetBase();
- },
[](auto &&) { return std::optional<NamedEntity>{}; },
},
std::move(dataRef->u));
@@ -528,22 +522,14 @@ const Symbol *UnwrapWholeSymbolOrComponentDataRef(const A &x) {
// If an expression is a whole symbol or a whole component designator,
// potentially followed by an image selector, extract and return that symbol,
// else null.
+const Symbol *UnwrapWholeSymbolOrComponentOrCoarrayRef(const DataRef &);
template <typename A>
const Symbol *UnwrapWholeSymbolOrComponentOrCoarrayRef(const A &x) {
if (auto dataRef{ExtractDataRef(x)}) {
- if (const SymbolRef * p{std::get_if<SymbolRef>(&dataRef->u)}) {
- return &p->get();
- } else if (const Component * c{std::get_if<Component>(&dataRef->u)}) {
- if (c->base().Rank() == 0) {
- return &c->GetLastSymbol();
- }
- } else if (const CoarrayRef * c{std::get_if<CoarrayRef>(&dataRef->u)}) {
- if (c->subscript().empty()) {
- return &c->GetLastSymbol();
- }
- }
+ return UnwrapWholeSymbolOrComponentOrCoarrayRef(*dataRef);
+ } else {
+ return nullptr;
}
- return nullptr;
}
// GetFirstSymbol(A%B%C[I]%D) -> A
diff --git a/flang/include/flang/Evaluate/traverse.h b/flang/include/flang/Evaluate/traverse.h
index 45402143604f4..48aafa8982559 100644
--- a/flang/include/flang/Evaluate/traverse.h
+++ b/flang/include/flang/Evaluate/traverse.h
@@ -146,8 +146,7 @@ class Traverse {
return Combine(x.base(), x.subscript());
}
Result operator()(const CoarrayRef &x) const {
- return Combine(
- x.base(), x.subscript(), x.cosubscript(), x.stat(), x.team());
+ return Combine(x.base(), x.cosubscript(), x.stat(), x.team());
}
Result operator()(const DataRef &x) const { return visitor_(x.u); }
Result operator()(const Substring &x) const {
diff --git a/flang/include/flang/Evaluate/variable.h b/flang/include/flang/Evaluate/variable.h
index 7f1518fd26e78..5c14421fd3a1b 100644
--- a/flang/include/flang/Evaluate/variable.h
+++ b/flang/include/flang/Evaluate/variable.h
@@ -98,8 +98,6 @@ class Component {
// A NamedEntity is either a whole Symbol or a component in an instance
// of a derived type. It may be a descriptor.
-// TODO: this is basically a symbol with an optional DataRef base;
-// could be used to replace Component.
class NamedEntity {
public:
CLASS_BOILERPLATE(NamedEntity)
@@ -239,28 +237,16 @@ class ArrayRef {
std::vector<Subscript> subscript_;
};
-// R914 coindexed-named-object
-// R924 image-selector, R926 image-selector-spec.
-// C825 severely limits the usage of derived types with coarray ultimate
-// components: they can't be pointers, allocatables, arrays, coarrays, or
-// function results. They can be components of other derived types.
-// Although the F'2018 Standard never prohibits multiple image-selectors
-// per se in the same data-ref or designator, nor the presence of an
-// image-selector after a part-ref with rank, the constraints on the
-// derived types that would have be involved make it impossible to declare
-// an object that could be referenced in these ways (esp. C748 & C825).
-// C930 precludes having both TEAM= and TEAM_NUMBER=.
-// TODO C931 prohibits the use of a coindexed object as a stat-variable.
+// A coindexed data-ref. The base is represented as a general
+// DataRef, but the base may not contain a CoarrayRef and may
+// have rank > 0 only in an uppermost ArrayRef.
class CoarrayRef {
public:
CLASS_BOILERPLATE(CoarrayRef)
- CoarrayRef(SymbolVector &&, std::vector<Subscript> &&,
- std::vector<Expr<SubscriptInteger>> &&);
+ CoarrayRef(DataRef &&, std::vector<Expr<SubscriptInteger>> &&);
- const SymbolVector &base() const { return base_; }
- SymbolVector &base() { return base_; }
- const std::vector<Subscript> &subscript() const { return subscript_; }
- std::vector<Subscript> &subscript() { return subscript_; }
+ const DataRef &base() const { return base_.value(); }
+ DataRef &base() { return base_.value(); }
const std::vector<Expr<SubscriptInteger>> &cosubscript() const {
return cosubscript_;
}
@@ -270,25 +256,24 @@ class CoarrayRef {
// (i.e., Designator or pointer-valued FunctionRef).
std::optional<Expr<SomeInteger>> stat() const;
CoarrayRef &set_stat(Expr<SomeInteger> &&);
- std::optional<Expr<SomeInteger>> team() const;
- bool teamIsTeamNumber() const { return teamIsTeamNumber_; }
- CoarrayRef &set_team(Expr<SomeInteger> &&, bool isTeamNumber = false);
+ // When team() is Expr<SomeInteger>, it's TEAM_NUMBER=; otherwise,
+ // it's TEAM=.
+ std::optional<Expr<SomeType>> team() const;
+ CoarrayRef &set_team(Expr<SomeType> &&);
int Rank() const;
int Corank() const { return 0; }
const Symbol &GetFirstSymbol() const;
const Symbol &GetLastSymbol() const;
- NamedEntity GetBase() const;
std::optional<Expr<SubscriptInteger>> LEN() const;
bool operator==(const CoarrayRef &) const;
llvm::raw_ostream &AsFortran(llvm::raw_ostream &) const;
private:
- SymbolVector base_;
- std::vector<Subscript> subscript_;
+ common::CopyableIndirection<DataRef> base_;
std::vector<Expr<SubscriptInteger>> cosubscript_;
- std::optional<common::CopyableIndirection<Expr<SomeInteger>>> stat_, team_;
- bool teamIsTeamNumber_{false}; // false: TEAM=, true: TEAM_NUMBER=
+ std::optional<common::CopyableIndirection<Expr<SomeInteger>>> stat_;
+ std::optional<common::CopyableIndirection<Expr<SomeType>>> team_;
};
// R911 data-ref is defined syntactically as a series of part-refs, which
diff --git a/flang/lib/Evaluate/check-expression.cpp b/flang/lib/Evaluate/check-expression.cpp
index d8baaf2e2a7ac..3d7f01d56c465 100644
--- a/flang/lib/Evaluate/check-expression.cpp
+++ b/flang/lib/Evaluate/check-expression.cpp
@@ -946,10 +946,7 @@ class IsContiguousHelper
return std::nullopt;
}
}
- Result operator()(const CoarrayRef &x) const {
- int rank{0};
- return CheckSubscripts(x.subscript(), rank).has_value();
- }
+ Result operator()(const CoarrayRef &x) const { return (*this)(x.base()); }
Result operator()(const Component &x) const {
if (x.base().Rank() == 0) {
return (*this)(x.GetLastSymbol());
diff --git a/flang/lib/Evaluate/fold.cpp b/flang/lib/Evaluate/fold.cpp
index 5fc31728ce5d6..45e842abf589f 100644
--- a/flang/lib/Evaluate/fold.cpp
+++ b/flang/lib/Evaluate/fold.cpp
@@ -162,22 +162,17 @@ ArrayRef FoldOperation(FoldingContext &context, ArrayRef &&arrayRef) {
}
CoarrayRef FoldOperation(FoldingContext &context, CoarrayRef &&coarrayRef) {
- std::vector<Subscript> subscript;
- for (Subscript x : coarrayRef.subscript()) {
- subscript.emplace_back(FoldOperation(context, std::move(x)));
- }
+ DataRef base{FoldOperation(context, std::move(coarrayRef.base()))};
std::vector<Expr<SubscriptInteger>> cosubscript;
for (Expr<SubscriptInteger> x : coarrayRef.cosubscript()) {
cosubscript.emplace_back(Fold(context, std::move(x)));
}
- CoarrayRef folded{std::move(coarrayRef.base()), std::move(subscript),
- std::move(cosubscript)};
+ CoarrayRef folded{std::move(base), std::move(cosubscript)};
if (std::optional<Expr<SomeInteger>> stat{coarrayRef.stat()}) {
folded.set_stat(Fold(context, std::move(*stat)));
}
- if (std::optional<Expr<SomeInteger>> team{coarrayRef.team()}) {
- folded.set_team(
- Fold(context, std::move(*team)), coarrayRef.teamIsTeamNumber());
+ if (std::optional<Expr<SomeType>> team{coarrayRef.team()}) {
+ folded.set_team(Fold(context, std::move(*team)));
}
return folded;
}
diff --git a/flang/lib/Evaluate/formatting.cpp b/flang/lib/Evaluate/formatting.cpp
index 6778fac9a44fd..121afc6f0f8bf 100644
--- a/flang/lib/Evaluate/formatting.cpp
+++ b/flang/lib/Evaluate/formatting.cpp
@@ -723,24 +723,8 @@ llvm::raw_ostream &ArrayRef::AsFortran(llvm::raw_ostream &o) const {
}
llvm::raw_ostream &CoarrayRef::AsFortran(llvm::raw_ostream &o) const {
- bool first{true};
- for (const Symbol &part : base_) {
- if (first) {
- first = false;
- } else {
- o << '%';
- }
- EmitVar(o, part);
- }
- char separator{'('};
- for (const auto &sscript : subscript_) {
- EmitVar(o << separator, sscript);
- separator = ',';
- }
- if (separator == ',') {
- o << ')';
- }
- separator = '[';
+ base().AsFortran(o);
+ char separator{'['};
for (const auto &css : cosubscript_) {
EmitVar(o << separator, css);
separator = ',';
@@ -750,8 +734,10 @@ llvm::raw_ostream &CoarrayRef::AsFortran(llvm::raw_ostream &o) const {
separator = ',';
}
if (team_) {
- EmitVar(
- o << separator, team_, teamIsTeamNumber_ ? "TEAM_NUMBER=" : "TEAM=");
+ EmitVar(o << separator, team_,
+ std::holds_alternative<Expr<SomeInteger>>(team_->value().u)
+ ? "TEAM_NUMBER="
+ : "TEAM=");
}
return o << ']';
}
diff --git a/flang/lib/Evaluate/shape.cpp b/flang/lib/Evaluate/shape.cpp
index f620ecd4a24bb..ac4811e9978eb 100644
--- a/flang/lib/Evaluate/shape.cpp
+++ b/flang/lib/Evaluate/shape.cpp
@@ -891,20 +891,7 @@ auto GetShapeHelper::operator()(const ArrayRef &arrayRef) const -> Result {
}
auto GetShapeHelper::operator()(const CoarrayRef &coarrayRef) const -> Result {
- NamedEntity base{coarrayRef.GetBase()};
- if (coarrayRef.subscript().empty()) {
- return (*this)(base);
- } else {
- Shape shape;
- int dimension{0};
- for (const Subscript &ss : coarrayRef.subscript()) {
- if (ss.Rank() > 0) {
- shape.emplace_back(GetExtent(ss, base, dimension));
- }
- ++dimension;
- }
- return shape;
- }
+ return (*this)(coarrayRef.base());
}
auto GetShapeHelper::operator()(const Substring &substring) const -> Result {
diff --git a/flang/lib/Evaluate/tools.cpp b/flang/lib/Evaluate/tools.cpp
index 702711e3cff53..16e2d6c0f7a55 100644
--- a/flang/lib/Evaluate/tools.cpp
+++ b/flang/lib/Evaluate/tools.cpp
@@ -1090,7 +1090,7 @@ auto GetSymbolVectorHelper::operator()(const ArrayRef &x) const -> Result {
return GetSymbolVector(x.base());
}
auto GetSymbolVectorHelper::operator()(const CoarrayRef &x) const -> Result {
- return x.base();
+ return GetSymbolVector(x.base());
}
const Symbol *GetLastTarget(const SymbolVector &symbols) {
@@ -1320,6 +1320,19 @@ std::optional<parser::MessageFixedText> CheckProcCompatibility(bool isCall,
return msg;
}
+const Symbol *UnwrapWholeSymbolOrComponentOrCoarrayRef(const DataRef &dataRef) {
+ if (const SymbolRef *p{std::get_if<SymbolRef>(&dataRef.u)}) {
+ return &p->get();
+ } else if (const Component *c{std::get_if<Component>(&dataRef.u)}) {
+ if (c->base().Rank() == 0) {
+ return &c->GetLastSymbol();
+ }
+ } else if (const CoarrayRef *c{std::get_if<CoarrayRef>(&dataRef.u)}) {
+ return UnwrapWholeSymbolOrComponentOrCoarrayRef(c->base());
+ }
+ return nullptr;
+}
+
// GetLastPointerSymbol()
static const Symbol *GetLastPointerSymbol(const Symbol &symbol) {
return IsPointer(GetAssociationRoot(symbol)) ? &symbol : nullptr;
diff --git a/flang/lib/Evaluate/variable.cpp b/flang/lib/Evaluate/variable.cpp
index 849194b492053..d1bff03a6ea5f 100644
--- a/flang/lib/Evaluate/variable.cpp
+++ b/flang/lib/Evaluate/variable.cpp
@@ -69,13 +69,9 @@ Triplet &Triplet::set_stride(Expr<SubscriptInteger> &&expr) {
return *this;
}
-CoarrayRef::CoarrayRef(SymbolVector &&base, std::vector<Subscript> &&ss,
- std::vector<Expr<SubscriptInteger>> &&css)
- : base_{std::move(base)}, subscript_(std::move(ss)),
- cosubscript_(std::move(css)) {
- CHECK(!base_.empty());
- CHECK(!cosubscript_.empty());
-}
+CoarrayRef::CoarrayRef(
+ DataRef &&base, std::vector<Expr<SubscriptInteger>> &&css)
+ : base_{std::move(base)}, cosubscript_(std::move(css)) {}
std::optional<Expr<SomeInteger>> CoarrayRef::stat() const {
if (stat_) {
@@ -85,7 +81,7 @@ std::optional<Expr<SomeInteger>> CoarrayRef::stat() const {
}
}
-std::optional<Expr<SomeInteger>> CoarrayRef::team() const {
+std::optional<Expr<SomeType>> CoarrayRef::team() const {
if (team_) {
return team_.value().value();
} else {
@@ -99,16 +95,18 @@ CoarrayRef &CoarrayRef::set_stat(Expr<SomeInteger> &&v) {
return *this;
}
-CoarrayRef &CoarrayRef::set_team(Expr<SomeInteger> &&v, bool isTeamNumber) {
- CHECK(IsVariable(v));
+CoarrayRef &CoarrayRef::set_team(Expr<SomeType> &&v) {
team_.emplace(std::move(v));
- teamIsTeamNumber_ = isTeamNumber;
return *this;
}
-const Symbol &CoarrayRef::GetFirstSymbol() const { return base_.front(); }
+const Symbol &CoarrayRef::GetFirstSymbol() const {
+ return base().GetFirstSymbol();
+}
-const Symbol &CoarrayRef::GetLastSymbol() const { return base_.back(); }
+const Symbol &CoarrayRef::GetLastSymbol() const {
+ return base().GetLastSymbol();
+}
void Substring::SetBounds(std::optional<Expr<SubscriptInteger>> &lower,
std::optional<Expr<SubscriptInteger>> &upper) {
@@ -426,17 +424,7 @@ int ArrayRef::Rank() const {
}
}
-int CoarrayRef::Rank() const {
- if (!subscript_.empty()) {
- int rank{0};
- for (const auto &expr : subscript_) {
- rank += expr.Rank();
- }
- return rank;
- } else {
- return base_.back()->Rank();
- }
-}
+int CoarrayRef::Rank() const { return base().Rank(); }
int DataRef::Rank() const {
return common::visit(common::visitors{
@@ -671,22 +659,6 @@ std::optional<DynamicType> Designator<T>::GetType() const {
return std::nullopt;
}
-static NamedEntity AsNamedEntity(const SymbolVector &x) {
- CHECK(!x.empty());
- NamedEntity result{x.front()};
- int j{0};
- for (const Symbol &symbol : x) {
- if (j++ != 0) {
- DataRef base{result.IsSymbol() ? DataRef{result.GetLastSymbol()}
- : DataRef{result.GetComponent()}};
- result = NamedEntity{Component{std::move(base), symbol}};
- }
- }
- return result;
-}
-
-NamedEntity CoarrayRef::GetBase() const { return AsNamedEntity(base_); }
-
// Equality testing
// For the purposes of comparing type parameter expressions while
@@ -759,9 +731,8 @@ bool ArrayRef::operator==(const ArrayRef &that) const {
return base_ == that.base_ && subscript_ == that.subscript_;
}
bool CoarrayRef::operator==(const CoarrayRef &that) const {
- return base_ == that.base_ && subscript_ == that.subscript_ &&
- cosubscript_ == that.cosubscript_ && stat_ == that.stat_ &&
- team_ == that.team_ && teamIsTeamNumber_ == that.teamIsTeamNumber_;
+ return base_ == that.base_ && cosubscript_ == that.cosubscript_ &&
+ stat_ == that.stat_ && team_ == that.team_;
}
bool DataRef::operator==(const DataRef &that) const {
return TestVariableEquality(*this, that);
diff --git a/flang/lib/Lower/Support/Utils.cpp b/flang/lib/Lower/Support/Utils.cpp
index ed2700c42fc55..668ee31a36bc3 100644
--- a/flang/lib/Lower/Support/Utils.cpp
+++ b/flang/lib/Lower/Support/Utils.cpp
@@ -70,18 +70,12 @@ class HashEvaluateExpr {
return getHashValue(x.base()) * 89u - subs;
}
static unsigned getHashValue(const Fortran::evaluate::CoarrayRef &x) {
- unsigned subs = 1u;
- for (const Fortran::evaluate::Subscript &v : x.subscript())
- subs -= getHashValue(v);
unsigned cosubs = 3u;
for (const Fortran::evaluate::Expr<Fortran::evaluate::SubscriptInteger> &v :
x.cosubscript())
cosubs -= getHashValue(v);
- unsigned syms = 7u;
- for (const Fortran::evaluate::SymbolRef &v : x.base())
- syms += getHashValue(v);
- return syms * 97u - subs - cosubs + getHashValue(x.stat()) + 257u +
- getHashValue(x.team());
+ return getHashValue(x.base()) * 97u - cosubs + getHashValue(x.stat()) +
+ 257u + getHashValue(x.team());
}
static unsigned getHashValue(const Fortran::evaluate::NamedEntity &x) {
if (x.IsSymbol())
@@ -339,7 +333,6 @@ class IsEqualEvaluateExpr {
static bool isEqual(const Fortran::evaluate::CoarrayRef &x,
const Fortran::evaluate::CoarrayRef &y) {
return isEqual(x.base(), y.base()) &&
- isEqual(x.subscript(), y.subscript()) &&
isEqual(x.cosubscript(), y.cosubscript()) &&
isEqual(x.stat(), y.stat()) && isEqual(x.team(), y.team());
}
diff --git a/flang/lib/Semantics/check-coarray.cpp b/flang/lib/Semantics/check-coarray.cpp
index b21e3cd757d6b..0e444f155f116 100644
--- a/flang/lib/Semantics/check-coarray.cpp
+++ b/flang/lib/Semantics/check-coarray.cpp
@@ -373,41 +373,12 @@ void CoarrayChecker::Leave(const parser::CriticalStmt &x) {
}
void CoarrayChecker::Leave(const parser::ImageSelector &imageSelector) {
- haveStat_ = false;
- haveTeam_ = false;
- haveTeamNumber_ = false;
for (const auto &imageSelectorSpec :
std::get<std::list<parser::ImageSelectorSpec>>(imageSelector.t)) {
- if (const auto *team{
- std::get_if<parser::TeamValue>(&imageSelectorSpec.u)}) {
- if (haveTeam_) {
- context_.Say(parser::FindSourceLocation(imageSelectorSpec), // C929
- "TEAM value can only be specified once"_err_en_US);
- }
- CheckTeamType(context_, *team);
- haveTeam_ = true;
- }
if (const auto *stat{std::get_if<parser::ImageSelectorSpec::Stat>(
&imageSelectorSpec.u)}) {
- if (haveStat_) {
- context_.Say(parser::FindSourceLocation(imageSelectorSpec), // C929
- "STAT variable can only be specified once"_err_en_US);
- }
CheckTeamStat(context_, *stat);
- haveStat_ = true;
}
- if (std::get_if<parser::ImageSelectorSpec::Team_Number>(
- &imageSelectorSpec.u)) {
- if (haveTeamNumber_) {
- context_.Say(parser::FindSourceLocation(imageSelectorSpec), // C929
- "TEAM_NUMBER value can only be specified once"_err_en_US);
- }
- haveTeamNumber_ = true;
- }
- }
- if (haveTeam_ && haveTeamNumber_) {
- context_.Say(parser::FindSourceLocation(imageSelector), // C930
- "Cannot specify both TEAM and TEAM_NUMBER"_err_en_US);
}
}
diff --git a/flang/lib/Semantics/check-coarray.h b/flang/lib/Semantics/check-coarray.h
index f156959019383..51de47f123558 100644
--- a/flang/lib/Semantics/check-coarray.h
+++ b/flang/lib/Semantics/check-coarray.h
@@ -37,9 +37,6 @@ class CoarrayChecker : public virtual BaseChecker {
private:
SemanticsContext &context_;
- bool haveStat_;
- bool haveTeam_;
- bool haveTeamNumber_;
void CheckNamesAreDistinct(const std::list<parser::CoarrayAssociation> &);
void Say2(const parser::CharBlock &, parser::MessageFixedText &&,
diff --git a/flang/lib/Semantics/dump-expr.cpp b/flang/lib/Semantics/dump-expr.cpp
index 850904bf897b9..aa0b4e0f03398 100644
--- a/flang/lib/Semantics/dump-expr.cpp
+++ b/flang/lib/Semantics/dump-expr.cpp
@@ -22,7 +22,6 @@ inline const char *DumpEvaluateExpr::GetIndentString() const {
void DumpEvaluateExpr::Show(const evaluate::CoarrayRef &x) {
Indent("coarray ref");
...
[truncated]
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
Bring the typed expression representation of a coindexed reference up to F'2023, which removed some restrictions that had allowed the current representation to suffice for older revisions of the language. This new representation is somewhat more simple -- it uses a DataRef as its base, so any subscripts in a part-ref can be represented as an ArrayRef there. Update the code that creates the CoarrayRef, and add more checking to it, as well as actually capturing any STAT=, TEAM=, & TEAM_NUMBER= specifiers that might appear. Enforce the constraint that the part-ref must have subscripts if it is an array. (And update a pile of copied-and-pasted test code that lacked such subscripts.)
eugeneepshteyn
approved these changes
Apr 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bring the typed expression representation of a coindexed reference up to F'2023, which removed some restrictions that had allowed the current representation to suffice for older revisions of the language. This new representation is somewhat more simple -- it uses a DataRef as its base, so any subscripts in a part-ref can be represented as an ArrayRef there.
Update the code that creates the CoarrayRef, and add more checking to it, as well as actually capturing any STAT=, TEAM=, & TEAM_NUMBER= specifiers that might appear. Enforce the constraint that the part-ref must have subscripts if it is an array. (And update a pile of copied-and-pasted test code that lacked such subscripts.)