diff options
| -rw-r--r-- | include/llvm/CodeGen/LiveVariables.h | 5 | ||||
| -rw-r--r-- | lib/CodeGen/LiveVariables.cpp | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/include/llvm/CodeGen/LiveVariables.h b/include/llvm/CodeGen/LiveVariables.h index 67c213daf2..1df98e50e0 100644 --- a/include/llvm/CodeGen/LiveVariables.h +++ b/include/llvm/CodeGen/LiveVariables.h @@ -39,8 +39,7 @@ class MRegisterInfo; class LiveVariables : public MachineFunctionPass { public: struct VarInfo { - /// DefBlock - The basic block which defines this value... - MachineBasicBlock *DefBlock; + /// DefInst - The machine instruction that defines this register. MachineInstr *DefInst; /// AliveBlocks - Set of blocks of which this value is alive completely @@ -55,7 +54,7 @@ public: /// std::vector<std::pair<MachineBasicBlock*, MachineInstr*> > Kills; - VarInfo() : DefBlock(0), DefInst(0) {} + VarInfo() : DefInst(0) {} /// removeKill - Delete a kill corresponding to the specified /// machine instruction. Returns true if there was a kill diff --git a/lib/CodeGen/LiveVariables.cpp b/lib/CodeGen/LiveVariables.cpp index d26848cb1c..883b7813e7 100644 --- a/lib/CodeGen/LiveVariables.cpp +++ b/lib/CodeGen/LiveVariables.cpp @@ -64,7 +64,7 @@ void LiveVariables::MarkVirtRegAliveInBlock(VarInfo &VRInfo, break; } - if (MBB == VRInfo.DefBlock) return; // Terminate recursion + if (MBB == VRInfo.DefInst->getParent()) return; // Terminate recursion if (VRInfo.AliveBlocks.size() <= BBNum) VRInfo.AliveBlocks.resize(BBNum+1); // Make space... @@ -95,7 +95,8 @@ void LiveVariables::HandleVirtRegUse(VarInfo &VRInfo, MachineBasicBlock *MBB, assert(VRInfo.Kills[i].first != MBB && "entry should be at end!"); #endif - assert(MBB != VRInfo.DefBlock && "Should have kill for defblock!"); + assert(MBB != VRInfo.DefInst->getParent() && + "Should have kill for defblock!"); // Add a new kill entry for this basic block. VRInfo.Kills.push_back(std::make_pair(MBB, MI)); @@ -230,8 +231,7 @@ bool LiveVariables::runOnMachineFunction(MachineFunction &MF) { if (MRegisterInfo::isVirtualRegister(MO.getReg())) { VarInfo &VRInfo = getVarInfo(MO.getReg()); - assert(VRInfo.DefBlock == 0 && "Variable multiply defined!"); - VRInfo.DefBlock = MBB; // Created here... + assert(VRInfo.DefInst == 0 && "Variable multiply defined!"); VRInfo.DefInst = MI; VRInfo.Kills.push_back(std::make_pair(MBB, MI)); // Defaults to dead } else if (MRegisterInfo::isPhysicalRegister(MO.getReg()) && |