[llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp MachineFunction.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

AsmPrinter.cpp updated: 1.50 -> 1.51
MachineFunction.cpp updated: 1.84 -> 1.85
---
Log message:

rename fields of constant pool entries


---
Diffs of the changes:  (+6 -6)

 AsmPrinter.cpp      |    8 ++++----
 MachineFunction.cpp |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)


Index: llvm/lib/CodeGen/AsmPrinter.cpp
diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.50 llvm/lib/CodeGen/AsmPrinter.cpp:1.51
--- llvm/lib/CodeGen/AsmPrinter.cpp:1.50	Wed Feb  8 20:26:04 2006
+++ llvm/lib/CodeGen/AsmPrinter.cpp	Wed Feb  8 22:22:52 2006
@@ -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);
   }
 }
 


Index: llvm/lib/CodeGen/MachineFunction.cpp
diff -u llvm/lib/CodeGen/MachineFunction.cpp:1.84 llvm/lib/CodeGen/MachineFunction.cpp:1.85
--- llvm/lib/CodeGen/MachineFunction.cpp:1.84	Tue Jan 31 16:21:33 2006
+++ llvm/lib/CodeGen/MachineFunction.cpp	Wed Feb  8 22:22:52 2006
@@ -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";
   }
 }