rename fields of constant pool entries
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26076 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp
index b6a4820..bd12c77 100644
--- a/lib/CodeGen/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter.cpp
@@ -106,16 +106,16 @@
/// 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 3c41dbe..94d8715 100644
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -347,8 +347,8 @@
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";
}
}