rename fields of constant pool entries

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26076 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 12 insertions, 14 deletions

diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp
index b6a48206df..bd12c775e8 100644
--- a/lib/CodeGen/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter.cpp
@@ -106,16 +106,16 @@ void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {
 /// the code generator.
 ///
 void AsmPrinter::EmitConstantPool(MachineConstantPool *MCP) {
-  const std::vector<std::pair<Constant*, unsigned> > &CP = MCP->getConstants();
+  const std::vector<MachineConstantPoolEntry> &CP = MCP->getConstants();
   if (CP.empty()) return;
   const TargetData &TD = TM.getTargetData();
   
   SwitchSection(ConstantPoolSection, 0);
   for (unsigned i = 0, e = CP.size(); i != e; ++i) {
-    EmitAlignment(CP[i].second);
+    EmitAlignment(CP[i].Alignment);
     O << PrivateGlobalPrefix << "CPI" << getFunctionNumber() << '_' << i
-      << ":\t\t\t\t\t" << CommentString << *CP[i].first << '\n';
-    EmitGlobalConstant(CP[i].first);
+      << ":\t\t\t\t\t" << CommentString << *CP[i].Val << '\n';
+    EmitGlobalConstant(CP[i].Val);
   }
 }
 
diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index 3c41dbe4bb..94d8715988 100644
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -347,8 +347,8 @@ void MachineFrameInfo::dump(const MachineFunction &MF) const {
 
 void MachineConstantPool::print(std::ostream &OS) const {
   for (unsigned i = 0, e = Constants.size(); i != e; ++i) {
-    OS << "  <cp #" << i << "> is" << *(Value*)Constants[i].first;
-    if (Constants[i].second != 0) OS << " , align=" << Constants[i].second;
+    OS << "  <cp #" << i << "> is" << *(Value*)Constants[i].Val;
+    OS << " , align=" << Constants[i].Alignment;
     OS << "\n";
   }
 }
diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp
index d2f943f401..5309692ec0 100644
--- a/lib/ExecutionEngine/JIT/JITEmitter.cpp
+++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp
@@ -566,18 +566,16 @@ void JITEmitter::finishFunction(MachineFunction &F) {
 }
 
 void JITEmitter::emitConstantPool(MachineConstantPool *MCP) {
-  const std::vector<std::pair<Constant*,unsigned> > &Constants = MCP->getConstants();
+  const std::vector<MachineConstantPoolEntry> &Constants = MCP->getConstants();
   if (Constants.empty()) return;
 
   for (unsigned i = 0, e = Constants.size(); i != e; ++i) {
-    const Type *Ty = Constants[i].first->getType();
+    const Type *Ty = Constants[i].Val->getType();
     unsigned Size      = (unsigned)TheJIT->getTargetData().getTypeSize(Ty);
-    unsigned Alignment = (Constants[i].second == 0)
-      ? TheJIT->getTargetData().getTypeAlignment(Ty)
-      : Constants[i].second;
+    unsigned Alignment = Constants[i].Alignment;
 
     void *Addr = MemMgr.allocateConstant(Size, Alignment);
-    TheJIT->InitializeMemory(Constants[i].first, Addr);
+    TheJIT->InitializeMemory(Constants[i].Val, Addr);
     ConstantPoolAddresses.push_back(Addr);
   }
 }
diff --git a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
index 638a699522..69f68094d5 100644
--- a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
+++ b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
@@ -724,12 +724,12 @@ void SparcV9AsmPrinter::emitFunction(const Function &F) {
 
   // Emit constant pool for this function
   const MachineConstantPool *MCP = MF.getConstantPool();
-  const std::vector<std::pair<Constant*, unsigned> > &CP = MCP->getConstants();
+  const std::vector<MachineConstantPoolEntry> &CP = MCP->getConstants();
 
   enterSection(ReadOnlyData);
   for (unsigned i = 0, e = CP.size(); i != e; ++i) {
     std::string cpiName = ".CPI_" + CurrentFnName + "_" + utostr(i);
-    printConstant(CP[i].first, CP[i].second, cpiName);
+    printConstant(CP[i].Val, CP[i].Alignment, cpiName);
   }
 
   enterSection(Text);