maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[NFC][SimplifyCFG] Rewrite isCleanupBlockEmpty() to be iterator_range-based

This commit is contained in:
Roman Lebedev 2020-08-08 17:20:36 +03:00
parent c2ebb32465
commit 1f452ac1d7
No known key found for this signature in database
GPG Key ID: 083C3EBB4A1689E0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/lib/Transforms/Utils/SimplifyCFG.cpp
View File

@ -4039,10 +4039,9 @@ bool SimplifyCFGOpt::simplifyCommonResume(ResumeInst *RI) {
}
// Check if cleanup block is empty
static bool isCleanupBlockEmpty(Instruction *Inst, Instruction *RI) {
BasicBlock::iterator I = Inst->getIterator(), E = RI->getIterator();
while (++I != E) {
auto *II = dyn_cast<IntrinsicInst>(I);
static bool isCleanupBlockEmpty(iterator_range<BasicBlock::iterator> R) {
for (Instruction &I : R) {
auto *II = dyn_cast<IntrinsicInst>(&I);
if (!II)
return false;
@ -4068,7 +4067,8 @@ bool SimplifyCFGOpt::simplifySingleResume(ResumeInst *RI) {
"Resume must unwind the exception that caused control to here");
// Check that there are no other instructions except for debug intrinsics.
if (!isCleanupBlockEmpty(LPInst, RI))
if (!isCleanupBlockEmpty(
make_range<Instruction *>(LPInst->getNextNode(), RI)))
return false;
// Turn all invokes that unwind here into calls and delete the basic block.
@ -4106,7 +4106,8 @@ static bool removeEmptyCleanup(CleanupReturnInst *RI) {
return false;
// Check that there are no other instructions except for benign intrinsics.
if (!isCleanupBlockEmpty(CPInst, RI))
if (!isCleanupBlockEmpty(
make_range<Instruction *>(CPInst->getNextNode(), RI)))
return false;
// If the cleanup return we are simplifying unwinds to the caller, this will