[llvm-commits] CVS: llvm/lib/CodeGen/MachineDebugInfo.cpp DwarfWriter.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

MachineDebugInfo.cpp updated: 1.29 -> 1.30
DwarfWriter.cpp updated: 1.46 -> 1.47
---
Log message:

back out my previous hack


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

 DwarfWriter.cpp      |    2 +-
 MachineDebugInfo.cpp |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/CodeGen/MachineDebugInfo.cpp
diff -u llvm/lib/CodeGen/MachineDebugInfo.cpp:1.29 llvm/lib/CodeGen/MachineDebugInfo.cpp:1.30
--- llvm/lib/CodeGen/MachineDebugInfo.cpp:1.29	Thu Mar  9 11:11:08 2006
+++ llvm/lib/CodeGen/MachineDebugInfo.cpp	Thu Mar  9 11:48:46 2006
@@ -653,7 +653,7 @@
 , Name("")
 , File(NULL)
 , Size(0)
-//, Align(0)
+, Align(0)
 , Offset(0)
 {}
 
@@ -667,7 +667,7 @@
   Visitor->Apply((DebugInfoDesc *&)File);
   Visitor->Apply(Line);
   Visitor->Apply(Size);
-  //Visitor->Apply(Align);
+  Visitor->Apply(Align);
   Visitor->Apply(Offset);
 }
 
@@ -692,7 +692,7 @@
             << "File(" << File << "), "
             << "Line(" << Line << "), "
             << "Size(" << Size << "), "
-  //<< "Align(" << Align << "), "
+            << "Align(" << Align << "), "
             << "Offset(" << Offset << ")\n";
 }
 #endif


Index: llvm/lib/CodeGen/DwarfWriter.cpp
diff -u llvm/lib/CodeGen/DwarfWriter.cpp:1.46 llvm/lib/CodeGen/DwarfWriter.cpp:1.47
--- llvm/lib/CodeGen/DwarfWriter.cpp:1.46	Thu Mar  9 11:11:08 2006
+++ llvm/lib/CodeGen/DwarfWriter.cpp	Thu Mar  9 11:48:46 2006
@@ -1323,7 +1323,7 @@
         unsigned Line = MemberDesc->getLine();
         TypeDesc *MemTy = MemberDesc->getFromType();
         uint64_t Size = MemberDesc->getSize();
-        uint64_t Align = 0; //MemberDesc->getAlign();
+        uint64_t Align = MemberDesc->getAlign();
         uint64_t Offset = MemberDesc->getOffset();
    
         // Construct member die.