[llvm-branch-commits] [llvm-branch] r86051 - /llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

[Bill Wendling]

Author: void
Date: Wed Nov  4 15:32:24 2009
New Revision: 86051

URL: http://llvm.org/viewvc/llvm-project?rev=86051&view=rev
Log:
$ svn merge -c 86043 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r86043 into '.':
U    lib/CodeGen/AsmPrinter/DwarfDebug.cpp


Modified:
    llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

Modified: llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=86051&r1=86050&r2=86051&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Wed Nov  4 15:32:24 2009
@@ -1138,7 +1138,9 @@
   AddSourceLine(MemberDie, &DT);
 
   uint64_t Size = DT.getSizeInBits();
-  uint64_t FieldSize = DT.getOriginalTypeSize();
+  uint64_t FieldSize = Size;
+  if (DT.getTypeDerivedFrom().getTag() != dwarf::DW_TAG_array_type)
+    FieldSize = DT.getOriginalTypeSize();
 
   if (Size != FieldSize) {
     // Handle bitfield.