[llvm-commits] [llvm] r63154 - /llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp

[Devang Patel]

Author: dpatel
Date: Tue Jan 27 17:22:55 2009
New Revision: 63154

URL: http://llvm.org/viewvc/llvm-project?rev=63154&view=rev
Log:
Add type DIE into appropriate context DIE.

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=63154&r1=63153&r2=63154&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Tue Jan 27 17:22:55 2009
@@ -1687,9 +1687,23 @@
       ConstructTypeDIE(DW_Unit, Buffer, DICompositeType(Ty.getGV()));
     }
     
-    // Add debug information entry to entity and unit.
-    DIE *Die = DW_Unit->AddDie(Buffer);
-    SetDIEntry(Slot, Die);
+    // Add debug information entry to entity and appropriate context.
+    DIE *Die = NULL;
+    DIDescriptor Context = Ty.getContext();
+    if (!Context.isNull())
+      Die = DW_Unit->getDieMapSlotFor(Context.getGV());
+
+    if (Die) {
+      DIE *Child = new DIE(Buffer);
+      Die->AddChild(Child);
+      Buffer.Detach();
+      SetDIEntry(Slot, Child);
+    }
+    else {
+      Die = DW_Unit->AddDie(Buffer);
+      SetDIEntry(Slot, Die);
+    }
+
     Entity->AddValue(DW_AT_type, DW_FORM_ref4, Slot);
   }