<div dir="ltr">Awesome, thanks for doing this Dave. It kept slipping off my radar :)<div><br></div><div>-eric</div></div><br><div class="gmail_quote"><div dir="ltr">On Tue, May 24, 2016 at 2:25 PM David Blaikie via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dblaikie<br>
Date: Tue May 24 16:19:28 2016<br>
New Revision: 270613<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=270613&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=270613&view=rev</a><br>
Log:<br>
DWARF: Omit DW_AT_APPLE attributes (except ObjC ones) when not targeting LLDB<br>
<br>
These attributes aren't used by other debuggers (& may be confused with<br>
other DWARF extensions) so they just waste space (about 1.5% on .dwo<br>
file size on a random large program I tested).<br>
<br>
We could remove the ObjC property ones too, but I figured they were<br>
probably more necessary when trying to understand ObjC (I could be wrong<br>
though) & so any debugger interested in working with ObjC would use<br>
them, perhaps? (also, there are some legacy tests in Clang that test for<br>
them - making it one of those annoying cross-project commits and/or<br>
cleanup to refactor those tests)<br>
<br>
Modified:<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp<br>
llvm/trunk/test/DebugInfo/Generic/2010-04-19-FramePtr.ll<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=270613&r1=270612&r2=270613&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=270613&r1=270612&r2=270613&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Tue May 24 16:19:28 2016<br>
@@ -287,7 +287,8 @@ DIE &DwarfCompileUnit::updateSubprogramS<br>
DIE *SPDie = getOrCreateSubprogramDIE(SP, includeMinimalInlineScopes());<br>
<br>
attachLowHighPC(*SPDie, Asm->getFunctionBegin(), Asm->getFunctionEnd());<br>
- if (!DD->getCurrentFunction()->getTarget().Options.DisableFramePointerElim(<br>
+ if (DD->useAppleExtensionAttributes() &&<br>
+ !DD->getCurrentFunction()->getTarget().Options.DisableFramePointerElim(<br>
*DD->getCurrentFunction()))<br>
addFlag(*SPDie, dwarf::DW_AT_APPLE_omit_frame_ptr);<br>
<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=270613&r1=270612&r2=270613&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=270613&r1=270612&r2=270613&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Tue May 24 16:19:28 2016<br>
@@ -234,6 +234,8 @@ DwarfDebug::DwarfDebug(AsmPrinter *A, Mo<br>
else<br>
HasDwarfAccelTables = DwarfAccelTables == Enable;<br>
<br>
+ HasAppleExtensionAttributes = tuneForLLDB();<br>
+<br>
// Handle split DWARF. Off by default for now.<br>
if (SplitDwarf == Default)<br>
HasSplitDwarf = false;<br>
@@ -419,16 +421,18 @@ DwarfDebug::constructDwarfCompileUnit(co<br>
addGnuPubAttributes(NewCU, Die);<br>
}<br>
<br>
- if (DIUnit->isOptimized())<br>
- NewCU.addFlag(Die, dwarf::DW_AT_APPLE_optimized);<br>
-<br>
- StringRef Flags = DIUnit->getFlags();<br>
- if (!Flags.empty())<br>
- NewCU.addString(Die, dwarf::DW_AT_APPLE_flags, Flags);<br>
-<br>
- if (unsigned RVer = DIUnit->getRuntimeVersion())<br>
- NewCU.addUInt(Die, dwarf::DW_AT_APPLE_major_runtime_vers,<br>
- dwarf::DW_FORM_data1, RVer);<br>
+ if (useAppleExtensionAttributes()) {<br>
+ if (DIUnit->isOptimized())<br>
+ NewCU.addFlag(Die, dwarf::DW_AT_APPLE_optimized);<br>
+<br>
+ StringRef Flags = DIUnit->getFlags();<br>
+ if (!Flags.empty())<br>
+ NewCU.addString(Die, dwarf::DW_AT_APPLE_flags, Flags);<br>
+<br>
+ if (unsigned RVer = DIUnit->getRuntimeVersion())<br>
+ NewCU.addUInt(Die, dwarf::DW_AT_APPLE_major_runtime_vers,<br>
+ dwarf::DW_FORM_data1, RVer);<br>
+ }<br>
<br>
if (useSplitDwarf())<br>
NewCU.initSection(Asm->getObjFileLowering().getDwarfInfoDWOSection());<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h?rev=270613&r1=270612&r2=270613&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h?rev=270613&r1=270612&r2=270613&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h Tue May 24 16:19:28 2016<br>
@@ -260,6 +260,7 @@ class DwarfDebug : public DebugHandlerBa<br>
/// DWARF5 Experimental Options<br>
/// @{<br>
bool HasDwarfAccelTables;<br>
+ bool HasAppleExtensionAttributes;<br>
bool HasSplitDwarf;<br>
<br>
/// Separated Dwarf Variables<br>
@@ -505,6 +506,10 @@ public:<br>
/// use to accelerate lookup.<br>
bool useDwarfAccelTables() const { return HasDwarfAccelTables; }<br>
<br>
+ bool useAppleExtensionAttributes() const {<br>
+ return HasAppleExtensionAttributes;<br>
+ }<br>
+<br>
/// Returns whether or not to change the current debug info for the<br>
/// split dwarf proposal support.<br>
bool useSplitDwarf() const { return HasSplitDwarf; }<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=270613&r1=270612&r2=270613&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=270613&r1=270612&r2=270613&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp Tue May 24 16:19:28 2016<br>
@@ -1244,11 +1244,13 @@ void DwarfUnit::applySubprogramAttribute<br>
if (!SP->isLocalToUnit())<br>
addFlag(SPDie, dwarf::DW_AT_external);<br>
<br>
- if (SP->isOptimized())<br>
- addFlag(SPDie, dwarf::DW_AT_APPLE_optimized);<br>
+ if (DD->useAppleExtensionAttributes()) {<br>
+ if (SP->isOptimized())<br>
+ addFlag(SPDie, dwarf::DW_AT_APPLE_optimized);<br>
<br>
- if (unsigned isa = Asm->getISAEncoding())<br>
- addUInt(SPDie, dwarf::DW_AT_APPLE_isa, dwarf::DW_FORM_flag, isa);<br>
+ if (unsigned isa = Asm->getISAEncoding())<br>
+ addUInt(SPDie, dwarf::DW_AT_APPLE_isa, dwarf::DW_FORM_flag, isa);<br>
+ }<br>
<br>
if (SP->isLValueReference())<br>
addFlag(SPDie, dwarf::DW_AT_reference);<br>
<br>
Modified: llvm/trunk/test/DebugInfo/Generic/2010-04-19-FramePtr.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/2010-04-19-FramePtr.ll?rev=270613&r1=270612&r2=270613&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/2010-04-19-FramePtr.ll?rev=270613&r1=270612&r2=270613&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/Generic/2010-04-19-FramePtr.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/Generic/2010-04-19-FramePtr.ll Tue May 24 16:19:28 2016<br>
@@ -1,7 +1,9 @@<br>
-; RUN: %llc_dwarf -asm-verbose -O1 -o %t < %s<br>
-; RUN: grep DW_AT_APPLE_omit_frame_ptr %t<br>
-; RUN: %llc_dwarf -disable-fp-elim -asm-verbose -O1 -o %t < %s<br>
-; RUN: grep -v DW_AT_APPLE_omit_frame_ptr %t<br>
+; RUN: %llc_dwarf -debugger-tune=lldb -asm-verbose -O1 -o - < %s | FileCheck %s<br>
+; RUN: %llc_dwarf -debugger-tune=gdb -asm-verbose -O1 -o - < %s | FileCheck %s --check-prefix=DISABLE<br>
+; RUN: %llc_dwarf -disable-fp-elim -debugger-tune=lldb -asm-verbose -O1 -o - < %s | FileCheck %s --check-prefix=DISABLE<br>
+<br>
+; CHECK: DW_AT_APPLE_omit_frame_ptr<br>
+; DISABLE-NOT: DW_AT_APPLE_omit_frame_ptr<br>
<br>
<br>
define i32 @foo() nounwind ssp !dbg !1 {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>