back out my previous hack

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

diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index e18596f2c698b0b40f80a49f217df6b349106022..68aeb101d69bef4153acf8c87dac52b04f67e1d1 100644 (file)
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -1323,7 +1323,7 @@ DIE *DwarfWriter::NewType(DIE *Context, TypeDesc *TyDesc) {
         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.

diff --git a/lib/CodeGen/MachineDebugInfo.cpp b/lib/CodeGen/MachineDebugInfo.cpp
index 2c871c8b47e12a454ab3dfe367e7eb4ab2d20b3a..fa755f1923e9f14eb62a81e8357d33bd6151fbdf 100644 (file)
--- a/lib/CodeGen/MachineDebugInfo.cpp
+++ b/lib/CodeGen/MachineDebugInfo.cpp
@@ -653,7 +653,7 @@ TypeDesc::TypeDesc(unsigned T)
 , Name("")
 , File(NULL)
 , Size(0)
-//, Align(0)
+, Align(0)
 , Offset(0)
 {}
 
@@ -667,7 +667,7 @@ void TypeDesc::ApplyToFields(DIVisitor *Visitor) {
   Visitor->Apply((DebugInfoDesc *&)File);
   Visitor->Apply(Line);
   Visitor->Apply(Size);
-  //Visitor->Apply(Align);
+  Visitor->Apply(Align);
   Visitor->Apply(Offset);
 }
 
@@ -692,7 +692,7 @@ void TypeDesc::dump() {
             << "File(" << File << "), "
             << "Line(" << Line << "), "
             << "Size(" << Size << "), "
-  //<< "Align(" << Align << "), "
+            << "Align(" << Align << "), "
             << "Offset(" << Offset << ")\n";
 }
 #endif