Skip to content

[CoroSplit] Always erase lifetime intrinsics for spilled allocas #142551

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 4 commits into from
Jun 3, 2025
Merged

[CoroSplit] Always erase lifetime intrinsics for spilled allocas #142551

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86dd52c
Erase lifetime intrinsics for spilled allocas
NewSigma Jun 3, 2025
d3692f3
Keep original comments
NewSigma Jun 3, 2025
a735ee5
Update llvm/lib/Transforms/Coroutines/CoroFrame.cpp
NewSigma Jun 3, 2025
8aa52a4
Erase lifetimes directly
NewSigma Jun 3, 2025
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
24 changes: 13 additions & 11 deletions llvm/lib/Transforms/Coroutines/CoroFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,14 +1212,25 @@ static void insertSpills(const FrameDataInfo &FrameData, coro::Shape &Shape) {
Builder.SetInsertPoint(Shape.AllocaSpillBlock,
Shape.AllocaSpillBlock->begin());
SmallVector<Instruction *, 4> UsersToUpdate;
SmallVector<Instruction *, 4> Lifetimes;
for (const auto &A : FrameData.Allocas) {
AllocaInst *Alloca = A.Alloca;
UsersToUpdate.clear();
Lifetimes.clear();
for (User *U : Alloca->users()) {
auto *I = cast<Instruction>(U);
if (DT.dominates(Shape.CoroBegin, I))
if (I->isLifetimeStartOrEnd())
Lifetimes.push_back(I);
else if (DT.dominates(Shape.CoroBegin, I))
UsersToUpdate.push_back(I);
}

// It is meaningless to retain the lifetime intrinsics refer for the
// member of coroutine frames and the meaningless lifetime intrinsics
// are possible to block further optimizations.
for (auto *I : Lifetimes)
I->eraseFromParent();

if (UsersToUpdate.empty())
continue;
auto *G = GetFramePointer(Alloca);
Expand All @@ -1233,17 +1244,8 @@ static void insertSpills(const FrameDataInfo &FrameData, coro::Shape &Shape) {
for (auto *DVR : DbgVariableRecords)
DVR->replaceVariableLocationOp(Alloca, G);

for (Instruction *I : UsersToUpdate) {
// It is meaningless to retain the lifetime intrinsics refer for the
// member of coroutine frames and the meaningless lifetime intrinsics
// are possible to block further optimizations.
if (I->isLifetimeStartOrEnd()) {
I->eraseFromParent();
continue;
}

for (Instruction *I : UsersToUpdate)
I->replaceUsesOfWith(Alloca, G);
}
}
Builder.SetInsertPoint(&*Shape.getInsertPtAfterFramePtr());
for (const auto &A : FrameData.Allocas) {
Expand Down
Loading