Use better data structure for ConstPoolId2AddrMap.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58532 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/ARM/ARMCodeEmitter.cpp b/lib/Target/ARM/ARMCodeEmitter.cpp
index 0e93254..7aca1de 100644
--- a/lib/Target/ARM/ARMCodeEmitter.cpp
+++ b/lib/Target/ARM/ARMCodeEmitter.cpp
@@ -43,16 +43,17 @@
const TargetData *TD;
TargetMachine &TM;
MachineCodeEmitter &MCE;
- const MachineConstantPool *MCP;
+ const std::vector<MachineConstantPoolEntry> *MCPEs;
+
public:
static char ID;
explicit ARMCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce)
: MachineFunctionPass(&ID), JTI(0), II(0), TD(0), TM(tm),
- MCE(mce), MCP(0) {}
+ MCE(mce), MCPEs(0) {}
ARMCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce,
const ARMInstrInfo &ii, const TargetData &td)
: MachineFunctionPass(&ID), JTI(0), II(&ii), TD(&td), TM(tm),
- MCE(mce), MCP(0) {}
+ MCE(mce), MCPEs(0) {}
bool runOnMachineFunction(MachineFunction &MF);
@@ -153,7 +154,8 @@
II = ((ARMTargetMachine&)MF.getTarget()).getInstrInfo();
TD = ((ARMTargetMachine&)MF.getTarget()).getTargetData();
JTI = ((ARMTargetMachine&)MF.getTarget()).getJITInfo();
- MCP = MF.getConstantPool();
+ MCPEs = &MF.getConstantPool()->getConstants();
+ JTI->ResizeConstPoolMap(MCPEs->size());
do {
DOUT << "JITTing function '" << MF.getFunction()->getName() << "'\n";
@@ -264,7 +266,7 @@
void ARMCodeEmitter::emitConstPoolInstruction(const MachineInstr &MI) {
unsigned CPI = MI.getOperand(0).getImm();
unsigned CPIndex = MI.getOperand(1).getIndex();
- const MachineConstantPoolEntry &MCPE = MCP->getConstants()[CPIndex];
+ const MachineConstantPoolEntry &MCPE = (*MCPEs)[CPIndex];
// Remember the CONSTPOOL_ENTRY address for later relocation.
JTI->addConstantPoolEntryAddr(CPI, MCE.getCurrentPCValue());