diff options
| -rw-r--r-- | include/llvm/CodeGen/FastISel.h | 3 | ||||
| -rw-r--r-- | lib/CodeGen/SelectionDAG/FastISel.cpp | 2 | ||||
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/include/llvm/CodeGen/FastISel.h b/include/llvm/CodeGen/FastISel.h index 4355113435..636081f6b9 100644 --- a/include/llvm/CodeGen/FastISel.h +++ b/include/llvm/CodeGen/FastISel.h @@ -17,7 +17,6 @@ #include "llvm/BasicBlock.h" #include "llvm/ADT/DenseMap.h" #include "llvm/CodeGen/SelectionDAGNodes.h" -#include <map> namespace llvm { @@ -53,7 +52,7 @@ public: BasicBlock::iterator SelectInstructions(BasicBlock::iterator Begin, BasicBlock::iterator End, DenseMap<const Value*, unsigned> &ValueMap, - std::map<const BasicBlock*, MachineBasicBlock *> &MBBMap, + DenseMap<const BasicBlock*, MachineBasicBlock *> &MBBMap, MachineBasicBlock *MBB); virtual ~FastISel(); diff --git a/lib/CodeGen/SelectionDAG/FastISel.cpp b/lib/CodeGen/SelectionDAG/FastISel.cpp index fb4de574a8..ebac0fe33b 100644 --- a/lib/CodeGen/SelectionDAG/FastISel.cpp +++ b/lib/CodeGen/SelectionDAG/FastISel.cpp @@ -145,7 +145,7 @@ BasicBlock::iterator FastISel::SelectInstructions(BasicBlock::iterator Begin, BasicBlock::iterator End, DenseMap<const Value*, unsigned> &ValueMap, - std::map<const BasicBlock*, + DenseMap<const BasicBlock*, MachineBasicBlock *> &MBBMap, MachineBasicBlock *mbb) { MBB = mbb; diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index e789c4e41c..7ec5b8534d 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -320,7 +320,7 @@ namespace llvm { FunctionLoweringInfo(TargetLowering &TLI, Function &Fn,MachineFunction &MF); /// MBBMap - A mapping from LLVM basic blocks to their machine code entry. - std::map<const BasicBlock*, MachineBasicBlock *> MBBMap; + DenseMap<const BasicBlock*, MachineBasicBlock *> MBBMap; /// ValueMap - Since we emit code for the function a basic block at a time, /// we must remember which virtual registers hold the values for @@ -330,7 +330,7 @@ namespace llvm { /// StaticAllocaMap - Keep track of frame indices for fixed sized allocas in /// the entry block. This allows the allocas to be efficiently referenced /// anywhere in the function. - std::map<const AllocaInst*, int> StaticAllocaMap; + DenseMap<const AllocaInst*, int> StaticAllocaMap; #ifndef NDEBUG SmallSet<Instruction*, 8> CatchInfoLost; @@ -1256,7 +1256,7 @@ SDValue SelectionDAGLowering::getValue(const Value *V) { // If this is a static alloca, generate it as the frameindex instead of // computation. if (const AllocaInst *AI = dyn_cast<AllocaInst>(V)) { - std::map<const AllocaInst*, int>::iterator SI = + DenseMap<const AllocaInst*, int>::iterator SI = FuncInfo.StaticAllocaMap.find(AI); if (SI != FuncInfo.StaticAllocaMap.end()) return DAG.getFrameIndex(SI->second, TLI.getPointerTy()); |