This is an archive of the discontinued LLVM Phabricator instance.

Differential D139143

[NFC] Cleanup: Replaces BB->getInstList().erase() with BB->erase().
ClosedPublic

Authored by vporpo on Dec 1 2022, 1:57 PM.

Details

Reviewers
aeubanks
asbirlea
Commits
rG4e30c3ddf025: [NFC] Cleanup: Replaces BB->getInstList().erase() with BB->erase().
Summary

This is part of a series of cleanup patches towards making BasicBlock::getInstList() private.

Diff Detail

Event Timeline

vporpo created this revision.Dec 1 2022, 1:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 1 2022, 1:57 PM
Herald added subscribers: pmatos, asb, hiraditya, sbc100. · View Herald Transcript
vporpo requested review of this revision.Dec 1 2022, 1:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 1 2022, 1:57 PM
Herald added subscribers: llvm-commits, aheejin. · View Herald Transcript
vporpo added a parent revision: D139142: [IR][NFC] Adds BasicBlock::erase()..Dec 1 2022, 1:58 PM
aeubanks accepted this revision.Dec 1 2022, 3:57 PM
This revision is now accepted and ready to land.Dec 1 2022, 3:57 PM
This revision was landed with ongoing or failed builds.Dec 1 2022, 6:20 PM
Closed by commit rG4e30c3ddf025: [NFC] Cleanup: Replaces BB->getInstList().erase() with BB->erase(). (authored by vporpo). · Explain Why
This revision was automatically updated to reflect the committed changes.
vporpo added a commit: rG4e30c3ddf025: [NFC] Cleanup: Replaces BB->getInstList().erase() with BB->erase()..
Harbormaster completed remote builds in B200622: Diff 479422.Dec 1 2022, 6:43 PM

Revision Contents

PathSize
llvm/
lib/
CodeGen/
3 lines

Diff 479496

llvm/lib/CodeGen/WasmEHPrepare.cpp

Show First 20 Lines • Show All 176 Lines • ▼ Show 20 Lines for (User *U : ThrowF->users()) {
// A call to @llvm.wasm.throw() is only generated from __cxa_throw() // A call to @llvm.wasm.throw() is only generated from __cxa_throw()
// builtin call within libcxxabi, and cannot be an InvokeInst. // builtin call within libcxxabi, and cannot be an InvokeInst.
auto *ThrowI = cast<CallInst>(U); auto *ThrowI = cast<CallInst>(U);
if (ThrowI->getFunction() != &F) if (ThrowI->getFunction() != &F)
continue; continue;
Changed = true; Changed = true;
auto *BB = ThrowI->getParent(); auto *BB = ThrowI->getParent();
SmallVector<BasicBlock *, 4> Succs(successors(BB)); SmallVector<BasicBlock *, 4> Succs(successors(BB));
auto &InstList = BB->getInstList(); BB->erase(std::next(BasicBlock::iterator(ThrowI)), BB->end());
InstList.erase(std::next(BasicBlock::iterator(ThrowI)), InstList.end());
IRB.SetInsertPoint(BB); IRB.SetInsertPoint(BB);
IRB.CreateUnreachable(); IRB.CreateUnreachable();
eraseDeadBBsAndChildren(Succs); eraseDeadBBsAndChildren(Succs);
} }
return Changed; return Changed;
} }
▲ Show 20 Lines • Show All 177 Lines • Show Last 20 Lines