diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/LiveIntervalAnalysis.cpp | 8 | ||||
| -rw-r--r-- | lib/CodeGen/LiveVariables.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index 405d9ec650..d75bf3fb0e 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -95,7 +95,7 @@ bool LiveIntervals::runOnMachineFunction(MachineFunction &fn) { // beginning of the function that we will pretend "defines" the values. This // is to make the interval analysis simpler by providing a number. if (fn.livein_begin() != fn.livein_end()) { - unsigned FirstLiveIn = *fn.livein_begin(); + unsigned FirstLiveIn = fn.livein_begin()->first; // Find a reg class that contains this live in. const TargetRegisterClass *RC = 0; @@ -128,11 +128,11 @@ bool LiveIntervals::runOnMachineFunction(MachineFunction &fn) { // Note intervals due to live-in values. if (fn.livein_begin() != fn.livein_end()) { MachineBasicBlock *Entry = fn.begin(); - for (MachineFunction::liveinout_iterator I = fn.livein_begin(), + for (MachineFunction::livein_iterator I = fn.livein_begin(), E = fn.livein_end(); I != E; ++I) { handlePhysicalRegisterDef(Entry, Entry->begin(), - getOrCreateInterval(*I), 0, 0); - for (const unsigned* AS = mri_->getAliasSet(*I); *AS; ++AS) + getOrCreateInterval(I->first), 0, 0); + for (const unsigned* AS = mri_->getAliasSet(I->first); *AS; ++AS) handlePhysicalRegisterDef(Entry, Entry->begin(), getOrCreateInterval(*AS), 0, 0); } diff --git a/lib/CodeGen/LiveVariables.cpp b/lib/CodeGen/LiveVariables.cpp index 94380ff542..c11e00f0c8 100644 --- a/lib/CodeGen/LiveVariables.cpp +++ b/lib/CodeGen/LiveVariables.cpp @@ -165,11 +165,11 @@ bool LiveVariables::runOnMachineFunction(MachineFunction &MF) { VirtRegInfo.resize(64); // Mark live-in registers as live-in. - for (MachineFunction::liveinout_iterator I = MF.livein_begin(), + for (MachineFunction::livein_iterator I = MF.livein_begin(), E = MF.livein_end(); I != E; ++I) { - assert(MRegisterInfo::isPhysicalRegister(*I) && + assert(MRegisterInfo::isPhysicalRegister(I->first) && "Cannot have a live-in virtual register!"); - HandlePhysRegDef(*I, 0); + HandlePhysRegDef(I->first, 0); } // Calculate live variable information in depth first order on the CFG of the @@ -272,7 +272,7 @@ bool LiveVariables::runOnMachineFunction(MachineFunction &MF) { // it as using all of the live-out values in the function. if (!MBB->empty() && TII.isReturn(MBB->back().getOpcode())) { MachineInstr *Ret = &MBB->back(); - for (MachineFunction::liveinout_iterator I = MF.liveout_begin(), + for (MachineFunction::liveout_iterator I = MF.liveout_begin(), E = MF.liveout_end(); I != E; ++I) { assert(MRegisterInfo::isPhysicalRegister(*I) && "Cannot have a live-in virtual register!"); |