Skip to content

Commit b4e5059

Browse files
committed
rename isUnordered
1 parent 765c061 commit b4e5059

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

flang/lib/Lower/Bridge.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ struct IncrementLoopInfo {
9797
bool isUnordered = false)
9898
: loopVariableSym{&sym}, lowerExpr{Fortran::semantics::GetExpr(lower)},
9999
upperExpr{Fortran::semantics::GetExpr(upper)},
100-
stepExpr{Fortran::semantics::GetExpr(step)}, isUnordered{isUnordered} {}
100+
stepExpr{Fortran::semantics::GetExpr(step)}, isConcurrent{isUnordered} {
101+
}
101102

102103
IncrementLoopInfo(IncrementLoopInfo &&) = default;
103104
IncrementLoopInfo &operator=(IncrementLoopInfo &&x) = default;
@@ -120,7 +121,7 @@ struct IncrementLoopInfo {
120121
const Fortran::lower::SomeExpr *upperExpr;
121122
const Fortran::lower::SomeExpr *stepExpr;
122123
const Fortran::lower::SomeExpr *maskExpr = nullptr;
123-
bool isUnordered; // do concurrent, forall
124+
bool isConcurrent;
124125
llvm::SmallVector<const Fortran::semantics::Symbol *> localSymList;
125126
llvm::SmallVector<const Fortran::semantics::Symbol *> localInitSymList;
126127
llvm::SmallVector<
@@ -2317,11 +2318,11 @@ class FirConverter : public Fortran::lower::AbstractConverter {
23172318
bool genDoConcurrent = false;
23182319

23192320
for (IncrementLoopInfo &info : incrementLoopNestInfo) {
2320-
genDoConcurrent = info.isStructured() && info.isUnordered;
2321+
genDoConcurrent = info.isStructured() && info.isConcurrent;
23212322

23222323
if (!genDoConcurrent)
23232324
info.loopVariable = genLoopVariableAddress(loc, *info.loopVariableSym,
2324-
info.isUnordered);
2325+
info.isConcurrent);
23252326

23262327
if (!getLoweringOptions().getIntegerWrapAround()) {
23272328
iofBackup = builder->getIntegerOverflowFlags();
@@ -2449,7 +2450,7 @@ class FirConverter : public Fortran::lower::AbstractConverter {
24492450

24502451
for (IncrementLoopInfo &info : llvm::reverse(incrementLoopNestInfo)) {
24512452
info.loopVariable = genLoopVariableAddress(loc, *info.loopVariableSym,
2452-
info.isUnordered);
2453+
info.isConcurrent);
24532454
}
24542455

24552456
builder->setInsertionPointToEnd(loopWrapperOp.getBody());
@@ -2512,7 +2513,7 @@ class FirConverter : public Fortran::lower::AbstractConverter {
25122513
IncrementLoopInfo &info = *it;
25132514
if (info.isStructured()) {
25142515
// End fir.do_concurent.loop.
2515-
if (info.isUnordered) {
2516+
if (info.isConcurrent) {
25162517
builder->setInsertionPointAfter(info.loopOp->getParentOp());
25172518
continue;
25182519
}

0 commit comments

Comments
 (0)