DwarfDebug: Emit dwo_id+dwo_name for DICompileUnits that provide a dwoId.

[oota-llvm.git] / lib / CodeGen / AsmPrinter / DwarfFile.cpp

diff --git a/lib/CodeGen/AsmPrinter/DwarfFile.cpp b/lib/CodeGen/AsmPrinter/DwarfFile.cpp
index 1060366a8ba313671e1e2cfba5c5af6b189c5ffb..51b27b462a7c67a5bdbbecc0414484df32f0da1c 100644 (file)
--- a/lib/CodeGen/AsmPrinter/DwarfFile.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfFile.cpp
@@ -103,18 +103,15 @@ unsigned DwarfFile::computeSizeAndOffset(DIE &Die, unsigned Offset) {
   // Size the DIE attribute values.
   for (const auto &V : Die.values())
     // Size attribute value.
-    Offset += V.SizeOf(Asm, V.getForm());
-
-  // Get the children.
-  const auto &Children = Die.getChildren();
+    Offset += V.SizeOf(Asm);
 
   // Size the DIE children if any.
-  if (!Children.empty()) {
+  if (Die.hasChildren()) {
     (void)Abbrev;
     assert(Abbrev.hasChildren() && "Children flag not set");
 
-    for (auto &Child : Children)
-      Offset = computeSizeAndOffset(*Child, Offset);
+    for (auto &Child : Die.children())
+      Offset = computeSizeAndOffset(Child, Offset);
 
     // End of children marker.
     Offset += sizeof(int8_t);