diff options
| author | Owen Anderson <resistor@mac.com> | 2007-11-08 01:32:45 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2007-11-08 01:32:45 +0000 |
| commit | 14b3fb78059a7b720ac9592e1f5d827166a5b5ac (patch) | |
| tree | ac063f84a4e1d69983ec75cf2dcae09c072642fa /lib/CodeGen | |
| parent | 401f78f8a9f85d0a01899166a6a3cea0cbcba663 (diff) | |
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
Diffstat (limited to 'lib/CodeGen')
| -rw-r--r-- | lib/CodeGen/StrongPHIElimination.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/CodeGen/StrongPHIElimination.cpp b/lib/CodeGen/StrongPHIElimination.cpp index 200ae8f84e..5f84b586cb 100644 --- a/lib/CodeGen/StrongPHIElimination.cpp +++ b/lib/CodeGen/StrongPHIElimination.cpp @@ -225,10 +225,9 @@ bool isLiveIn(LiveVariables::VarInfo& V, MachineBasicBlock* MBB) { 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 @@ bool isLiveIn(LiveVariables::VarInfo& V, MachineBasicBlock* MBB) { /// 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())) - return true; - - if (V.DefInst->getParent() == MBB) + 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; + } return false; } |