Skip to content

[NFC][Coroutines] Use structured binding with llvm::enumerate in CoroSplit #116879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2024
Merged

[NFC][Coroutines] Use structured binding with llvm::enumerate in CoroSplit #116879

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a97faf8
[Coroutines] Use structured binding with llvm::enumerate
Nov 19, 2024
a6a7d0d
Merge branch 'main' into amd/dev/tnowicki/use.struct.binding
Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions llvm/lib/Transforms/Coroutines/CoroSplit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,11 +628,11 @@ void CoroCloner::replaceRetconOrAsyncSuspendUses() {
return;

// Otherwise, we need to create an aggregate.
Value *Agg = PoisonValue::get(NewS->getType());
for (auto Arg : llvm::enumerate(Args))
Agg = Builder.CreateInsertValue(Agg, Arg.value(), Arg.index());
Value *Aggr = PoisonValue::get(NewS->getType());
for (auto [Idx, Arg] : llvm::enumerate(Args))
Aggr = Builder.CreateInsertValue(Aggr, Arg, Idx);

NewS->replaceAllUsesWith(Agg);
NewS->replaceAllUsesWith(Aggr);
}

void CoroCloner::replaceCoroSuspends() {
Expand Down Expand Up @@ -1834,8 +1834,8 @@ void coro::AsyncABI::splitCoroutine(Function &F, coro::Shape &Shape,

// Create a continuation function for each of the suspend points.
Clones.reserve(Shape.CoroSuspends.size());
for (auto CS : llvm::enumerate(Shape.CoroSuspends)) {
auto *Suspend = cast<CoroSuspendAsyncInst>(CS.value());
for (auto [Idx, CS] : llvm::enumerate(Shape.CoroSuspends)) {
auto *Suspend = cast<CoroSuspendAsyncInst>(CS);

// Create the clone declaration.
auto ResumeNameSuffix = ".resume.";
Expand All @@ -1851,8 +1851,8 @@ void coro::AsyncABI::splitCoroutine(Function &F, coro::Shape &Shape,
}
auto *Continuation = createCloneDeclaration(
F, Shape,
UseSwiftMangling ? ResumeNameSuffix + Twine(CS.index()) + "_"
: ResumeNameSuffix + Twine(CS.index()),
UseSwiftMangling ? ResumeNameSuffix + Twine(Idx) + "_"
: ResumeNameSuffix + Twine(Idx),
NextF, Suspend);
Clones.push_back(Continuation);

Expand Down Expand Up @@ -1885,12 +1885,12 @@ void coro::AsyncABI::splitCoroutine(Function &F, coro::Shape &Shape,
}

assert(Clones.size() == Shape.CoroSuspends.size());
for (auto CS : llvm::enumerate(Shape.CoroSuspends)) {
auto *Suspend = CS.value();
auto *Clone = Clones[CS.index()];
for (auto [Idx, CS] : llvm::enumerate(Shape.CoroSuspends)) {
auto *Suspend = CS;
auto *Clone = Clones[Idx];

CoroCloner::createClone(F, "resume." + Twine(CS.index()), Shape, Clone,
Suspend, TTI);
CoroCloner::createClone(F, "resume." + Twine(Idx), Shape, Clone, Suspend,
TTI);
}
}

Expand Down Expand Up @@ -1947,12 +1947,12 @@ void coro::AnyRetconABI::splitCoroutine(Function &F, coro::Shape &Shape,

// Create a continuation function for each of the suspend points.
Clones.reserve(Shape.CoroSuspends.size());
for (auto CS : llvm::enumerate(Shape.CoroSuspends)) {
auto Suspend = cast<CoroSuspendRetconInst>(CS.value());
for (auto [Idx, CS] : llvm::enumerate(Shape.CoroSuspends)) {
auto Suspend = cast<CoroSuspendRetconInst>(CS);

// Create the clone declaration.
auto Continuation = createCloneDeclaration(
F, Shape, ".resume." + Twine(CS.index()), NextF, nullptr);
F, Shape, ".resume." + Twine(Idx), NextF, nullptr);
Clones.push_back(Continuation);

// Insert a branch to the unified return block immediately before
Expand Down Expand Up @@ -2016,12 +2016,12 @@ void coro::AnyRetconABI::splitCoroutine(Function &F, coro::Shape &Shape,
}

assert(Clones.size() == Shape.CoroSuspends.size());
for (auto CS : llvm::enumerate(Shape.CoroSuspends)) {
auto Suspend = CS.value();
auto Clone = Clones[CS.index()];
for (auto [Idx, CS] : llvm::enumerate(Shape.CoroSuspends)) {
auto Suspend = CS;
auto Clone = Clones[Idx];

CoroCloner::createClone(F, "resume." + Twine(CS.index()), Shape, Clone,
Suspend, TTI);
CoroCloner::createClone(F, "resume." + Twine(Idx), Shape, Clone, Suspend,
TTI);
}
}

Expand Down
Loading