commit e12ab1276d6fa9221fb4bbc9556493aad9b51a0f
author David Blaikie <dblaikie@gmail.com> Tue Apr 01 16:09:49 2014 +0000
committer David Blaikie <dblaikie@gmail.com> Tue Apr 01 16:09:49 2014 +0000
tree 0fac8796b68b1f4e405c2c1813b0ddc4150ee2e5
parent dd690a2ca48cf8b63f44af4ba8933a8a9d41ec48

Simplify debug_loc.dwo handling slightly.

llvm-svn: 205322

llvm/lib/CodeGen/AsmPrinter/DIE.cpp

diff --git a/llvm/lib/CodeGen/AsmPrinter/DIE.cpp b/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
index 34f070e..cea9df1 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
@@ -562,9 +562,7 @@
   DwarfDebug *DD = AP->getDwarfDebug();
   MCSymbol *Label = AP->GetTempSymbol("debug_loc", Index);
 
-  if (DD->useSplitDwarf())
-    AP->EmitLabelDifference(Label, DD->getDebugLocDWOSym(), 4);
-  else if (AP->MAI->doesDwarfUseRelocationsAcrossSections())
+  if (AP->MAI->doesDwarfUseRelocationsAcrossSections() && !DD->useSplitDwarf())
     AP->EmitSectionOffset(Label, DD->getDebugLocSym());
   else
     AP->EmitLabelDifference(Label, DD->getDebugLocSym(), 4);