StrongPHIElim: Now with even fewer trivial bugs!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45775 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/StrongPHIElimination.cpp b/lib/CodeGen/StrongPHIElimination.cpp
index aa25dfe..efe8381 100644
--- a/lib/CodeGen/StrongPHIElimination.cpp
+++ b/lib/CodeGen/StrongPHIElimination.cpp
@@ -215,7 +215,9 @@
stack.pop_back();
CurrentParent = stack.back();
- parentBlock = LV.getVarInfo(CurrentParent->getReg()).DefInst->getParent();
+ parentBlock = CurrentParent->getReg() ?
+ LV.getVarInfo(CurrentParent->getReg()).DefInst->getParent() :
+ 0;
}
DomForestNode* child = new DomForestNode(*I, CurrentParent);
@@ -361,7 +363,7 @@
std::set<unsigned> ProcessedNames;
MachineBasicBlock::iterator P = MBB->begin();
- while (P->getOpcode() == TargetInstrInfo::PHI) {
+ while (P != MBB->end() && P->getOpcode() == TargetInstrInfo::PHI) {
LiveVariables::VarInfo& PHIInfo = LV.getVarInfo(P->getOperand(0).getReg());
unsigned DestReg = P->getOperand(0).getReg();