From 8ba9771549bcff6109ad45ff3944a1b6c3c54b46 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 1 Jul 2004 04:29:47 +0000 Subject: [PATCH] Start using MBB numbers directly instead of going through the live variables map. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14518 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/LiveIntervalAnalysis.cpp | 2 +- lib/CodeGen/LiveVariables.cpp | 4 ++-- lib/CodeGen/PHIElimination.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index 4fc08ec6b9c..cdcebfcc7e0 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -96,7 +96,7 @@ bool LiveIntervals::runOnMachineFunction(MachineFunction &fn) { unsigned miIndex = 0; for (MachineFunction::iterator mbb = mf_->begin(), mbbEnd = mf_->end(); mbb != mbbEnd; ++mbb) { - unsigned mbbIdx = lv_->getMachineBasicBlockIndex(mbb); + unsigned mbbIdx = mbb->getNumber(); bool inserted = mbbi2mbbMap_.insert(std::make_pair(mbbIdx, mbb)).second; assert(inserted && "multiple index -> MachineBasicBlock"); diff --git a/lib/CodeGen/LiveVariables.cpp b/lib/CodeGen/LiveVariables.cpp index 80fab5c4155..0edb307b903 100644 --- a/lib/CodeGen/LiveVariables.cpp +++ b/lib/CodeGen/LiveVariables.cpp @@ -70,7 +70,7 @@ LiveVariables::VarInfo &LiveVariables::getVarInfo(unsigned RegIdx) { void LiveVariables::MarkVirtRegAliveInBlock(VarInfo &VRInfo, MachineBasicBlock *MBB) { - unsigned BBNum = getMachineBasicBlockIndex(MBB); + unsigned BBNum = MBB->getNumber(); // Check to see if this basic block is one of the killing blocks. If so, // remove it... @@ -204,7 +204,7 @@ bool LiveVariables::runOnMachineFunction(MachineFunction &MF) { for (df_ext_iterator DFI = df_ext_begin(Entry, Visited), E = df_ext_end(Entry, Visited); DFI != E; ++DFI) { MachineBasicBlock *MBB = *DFI; - unsigned BBNum = getMachineBasicBlockIndex(MBB); + unsigned BBNum = MBB->getNumber(); // Loop over all of the instructions, processing them. for (MachineBasicBlock::iterator I = MBB->begin(), E = MBB->end(); diff --git a/lib/CodeGen/PHIElimination.cpp b/lib/CodeGen/PHIElimination.cpp index 895dadde5cd..40bf5883ddc 100644 --- a/lib/CodeGen/PHIElimination.cpp +++ b/lib/CodeGen/PHIElimination.cpp @@ -226,7 +226,7 @@ bool PNE::EliminatePHINodes(MachineFunction &MF, MachineBasicBlock &MBB) { MachineBasicBlock *SuccMBB = *SI; // Is it alive in this successor? - unsigned SuccIdx = LV->getMachineBasicBlockIndex(SuccMBB); + unsigned SuccIdx = SuccMBB->getNumber(); if (SuccIdx < InRegVI.AliveBlocks.size() && InRegVI.AliveBlocks[SuccIdx]) { ValueIsLive = true; -- 2.34.1