6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-23 17:29:19 +00:00
Code Issues Projects Releases Wiki Activity

[IR] Make getFirstNonPHI return null if the BB is empty

Browse Source 
getFirstNonPHI's documentation states that it returns null if there is
no non-PHI instruction.  However, it instead returns a pointer to the
end iterator.  The implementation of getFirstNonPHI claims that
dereferencing the iterator will result in an assertion failure but this
doesn't occur.  Instead, machinery like getFirstInsertionPt will attempt
to isa<> this invalid memory which results in unpredictable behavior.
Instead, make getFirst* return null if no such instruction exists.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241570 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer 2015-07-07 09:15:29 +00:00
parent 2b4a535b70
commit 2822246ece
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/IR/BasicBlock.cpp
View File

@ -163,47 +163,40 @@ CallInst *BasicBlock::getTerminatingMustTailCall() {
}
Instruction* BasicBlock::getFirstNonPHI() {
BasicBlock::iterator i = begin();
// All valid basic blocks should have a terminator,
// which is not a PHINode. If we have an invalid basic
// block we'll get an assertion failure when dereferencing
// a past-the-end iterator.
while (isa<PHINode>(i)) ++i;
return &*i;
for (Instruction &I : *this)
if (!isa<PHINode>(I))
return &I;
return nullptr;
}
Instruction* BasicBlock::getFirstNonPHIOrDbg() {
BasicBlock::iterator i = begin();
// All valid basic blocks should have a terminator,
// which is not a PHINode. If we have an invalid basic
// block we'll get an assertion failure when dereferencing
// a past-the-end iterator.
while (isa<PHINode>(i) || isa<DbgInfoIntrinsic>(i)) ++i;
return &*i;
for (Instruction &I : *this)
if (!isa<PHINode>(I) && !isa<DbgInfoIntrinsic>(I))
return &I;
return nullptr;
}
Instruction* BasicBlock::getFirstNonPHIOrDbgOrLifetime() {
// All valid basic blocks should have a terminator,
// which is not a PHINode. If we have an invalid basic
// block we'll get an assertion failure when dereferencing
// a past-the-end iterator.
BasicBlock::iterator i = begin();
for (;; ++i) {
if (isa<PHINode>(i) || isa<DbgInfoIntrinsic>(i))
for (Instruction &I : *this) {
if (isa<PHINode>(I) || isa<DbgInfoIntrinsic>(I))
continue;
const IntrinsicInst *II = dyn_cast<IntrinsicInst>(i);
if (!II)
break;
if (II->getIntrinsicID() != Intrinsic::lifetime_start &&
II->getIntrinsicID() != Intrinsic::lifetime_end)
break;
if (auto *II = dyn_cast<IntrinsicInst>(&I))
if (II->getIntrinsicID() == Intrinsic::lifetime_start ||
II->getIntrinsicID() == Intrinsic::lifetime_end)
continue;
return &I;
}
return &*i;
return nullptr;
}
BasicBlock::iterator BasicBlock::getFirstInsertionPt() {
iterator InsertPt = getFirstNonPHI();
Instruction *FirstNonPHI = getFirstNonPHI();
if (!FirstNonPHI)
return end();
iterator InsertPt = FirstNonPHI;
if (isa<LandingPadInst>(InsertPt)) ++InsertPt;
return InsertPt;
}