Take another stab at getting isLiveIn() and isLiveOut() right.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@43869 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/StrongPHIElimination.cpp b/lib/CodeGen/StrongPHIElimination.cpp
index 200ae8f..5f84b58 100644
--- a/lib/CodeGen/StrongPHIElimination.cpp
+++ b/lib/CodeGen/StrongPHIElimination.cpp
@@ -225,10 +225,9 @@
if (V.AliveBlocks.test(MBB->getNumber()))
return true;
- for (std::vector<MachineInstr*>::iterator I = V.Kills.begin(),
- E = V.Kills.end(); I != E; ++I)
- if ((*I)->getParent() == MBB)
- return true;
+ if (V.DefInst->getParent() != MBB &&
+ V.UsedBlocks.test(MBB->getNumber()))
+ return true;
return false;
}
@@ -236,11 +235,15 @@
/// isLiveOut - help method that determines, from a VarInfo, if a register is
/// live out of a block.
bool isLiveOut(LiveVariables::VarInfo& V, MachineBasicBlock* MBB) {
- if (V.AliveBlocks.test(MBB->getNumber()))
+ if (MBB == V.DefInst->getParent() ||
+ V.UsedBlocks.test(MBB->getNumber())) {
+ for (std::vector<MachineInstr*>::iterator I = V.Kills.begin(),
+ E = V.Kills.end(); I != E; ++I)
+ if ((*I)->getParent() == MBB)
+ return false;
+
return true;
-
- if (V.DefInst->getParent() == MBB)
- return true;
+ }
return false;
}