commit e40caaee99a9a34030f33fe5548f22b26d02db8b
author David Blaikie <dblaikie@gmail.com> Thu Dec 01 21:59:09 2016 +0000
committer David Blaikie <dblaikie@gmail.com> Thu Dec 01 21:59:09 2016 +0000
tree 216cdc8ec125190194d06a0b4abcffd547dc2028
parent 76b913c470327fbc1a95cd5fc98b78b0f6980695

[debug info] Minor cleanup from D27170/r288399

llvm-svn: 288421

llvm/lib/CodeGen/AsmPrinter/DIE.cpp

diff --git a/llvm/lib/CodeGen/AsmPrinter/DIE.cpp b/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
index ef1e41f..06023fc 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
@@ -202,7 +202,7 @@
     : Die(UnitTag), Section(nullptr), Offset(0), Length(0), Version(V),
       AddrSize(A)
 {
-  Die.setUnit(this);
+  Die.Owner = this;
   assert((UnitTag == dwarf::DW_TAG_compile_unit ||
           UnitTag == dwarf::DW_TAG_type_unit ||
           UnitTag == dwarf::DW_TAG_partial_unit) && "expected a unit TAG");

llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
index b1f818b..9412e50 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
@@ -194,7 +194,7 @@
   void emitHeader(bool UseOffsets) override;
 
   MCSymbol *getLabelBegin() const {
-    assert(Section);
+    assert(getSection());
     return LabelBegin;
   }
 

llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h
index 6d045ea..f365930 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h
@@ -112,7 +112,7 @@
   const DICompileUnit *getCUNode() const { return CUNode; }
 
   /// Return true if this compile unit has something to write out.
-  bool hasContent() const { return Die.hasChildren(); }
+  bool hasContent() const { return getUnitDie().hasChildren(); }
 
   /// Get string containing language specific context for a global name.
   ///