<br><div>Test and comments please.</div><div><br></div><div>-eric</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Nov 6, 2012 at 8:42 PM, Bill Wendling <span dir="ltr"><<a href="mailto:isanbard@gmail.com" target="_blank">isanbard@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: void<br>
Date: Tue Nov 6 22:42:18 2012<br>
New Revision: 167524<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=167524&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=167524&view=rev</a><br>
Log:<br>
When we're updating the subprogram scope DIE, we want to determine if we're<br>
updating an abstract DIE or not. If we are, then we use that. Its children will<br>
be added on later, as well as the object pointer attribute. Otherwise, this<br>
function may be called with a concrete DIE twice and adding the children and<br>
object pointer attribute to it twice.<br>
<rdar://problem/12401423&12600340><br>
<br>
Modified:<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<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=167524&r1=167523&r2=167524&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=167524&r1=167523&r2=167524&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Tue Nov 6 22:42:18 2012<br>
@@ -307,47 +307,48 @@<br>
assert(SPDie && "Unable to find subprogram DIE!");<br>
DISubprogram SP(SPNode);<br>
<br>
- DISubprogram SPDecl = SP.getFunctionDeclaration();<br>
- if (!SPDecl.isSubprogram()) {<br>
- // There is not any need to generate specification DIE for a function<br>
- // defined at compile unit level. If a function is defined inside another<br>
- // function then gdb prefers the definition at top level and but does not<br>
- // expect specification DIE in parent function. So avoid creating<br>
- // specification DIE for a function defined inside a function.<br>
- if (SP.isDefinition() && !SP.getContext().isCompileUnit() &&<br>
- !SP.getContext().isFile() &&<br>
- !isSubprogramContext(SP.getContext())) {<br>
- SPCU->addFlag(SPDie, dwarf::DW_AT_declaration);<br>
-<br>
- // Add arguments.<br>
- DICompositeType SPTy = SP.getType();<br>
- DIArray Args = SPTy.getTypeArray();<br>
- unsigned SPTag = SPTy.getTag();<br>
- if (SPTag == dwarf::DW_TAG_subroutine_type)<br>
- for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) {<br>
- DIE *Arg = new DIE(dwarf::DW_TAG_formal_parameter);<br>
- DIType ATy = DIType(Args.getElement(i));<br>
- SPCU->addType(Arg, ATy);<br>
- if (ATy.isArtificial())<br>
- SPCU->addFlag(Arg, dwarf::DW_AT_artificial);<br>
- if (ATy.isObjectPointer())<br>
- SPCU->addDIEEntry(SPDie, dwarf::DW_AT_object_pointer,<br>
- dwarf::DW_FORM_ref4, Arg);<br>
- SPDie->addChild(Arg);<br>
- }<br>
- DIE *SPDeclDie = SPDie;<br>
- SPDie = new DIE(dwarf::DW_TAG_subprogram);<br>
- SPCU->addDIEEntry(SPDie, dwarf::DW_AT_specification, dwarf::DW_FORM_ref4,<br>
- SPDeclDie);<br>
- SPCU->addDie(SPDie);<br>
- }<br>
- }<br>
// Pick up abstract subprogram DIE.<br>
if (DIE *AbsSPDIE = AbstractSPDies.lookup(SPNode)) {<br>
SPDie = new DIE(dwarf::DW_TAG_subprogram);<br>
SPCU->addDIEEntry(SPDie, dwarf::DW_AT_abstract_origin,<br>
dwarf::DW_FORM_ref4, AbsSPDIE);<br>
SPCU->addDie(SPDie);<br>
+ } else {<br>
+ DISubprogram SPDecl = SP.getFunctionDeclaration();<br>
+ if (!SPDecl.isSubprogram()) {<br>
+ // There is not any need to generate specification DIE for a function<br>
+ // defined at compile unit level. If a function is defined inside another<br>
+ // function then gdb prefers the definition at top level and but does not<br>
+ // expect specification DIE in parent function. So avoid creating<br>
+ // specification DIE for a function defined inside a function.<br>
+ if (SP.isDefinition() && !SP.getContext().isCompileUnit() &&<br>
+ !SP.getContext().isFile() &&<br>
+ !isSubprogramContext(SP.getContext())) {<br>
+ SPCU->addFlag(SPDie, dwarf::DW_AT_declaration);<br>
+<br>
+ // Add arguments.<br>
+ DICompositeType SPTy = SP.getType();<br>
+ DIArray Args = SPTy.getTypeArray();<br>
+ unsigned SPTag = SPTy.getTag();<br>
+ if (SPTag == dwarf::DW_TAG_subroutine_type)<br>
+ for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) {<br>
+ DIE *Arg = new DIE(dwarf::DW_TAG_formal_parameter);<br>
+ DIType ATy = DIType(Args.getElement(i));<br>
+ SPCU->addType(Arg, ATy);<br>
+ if (ATy.isArtificial())<br>
+ SPCU->addFlag(Arg, dwarf::DW_AT_artificial);<br>
+ if (ATy.isObjectPointer())<br>
+ SPCU->addDIEEntry(SPDie, dwarf::DW_AT_object_pointer,<br>
+ dwarf::DW_FORM_ref4, Arg);<br>
+ SPDie->addChild(Arg);<br>
+ }<br>
+ DIE *SPDeclDie = SPDie;<br>
+ SPDie = new DIE(dwarf::DW_TAG_subprogram);<br>
+ SPCU->addDIEEntry(SPDie, dwarf::DW_AT_specification, dwarf::DW_FORM_ref4,<br>
+ SPDeclDie);<br>
+ SPCU->addDie(SPDie);<br>
+ }<br>
+ }<br>
}<br>
<br>
SPCU->addLabel(SPDie, dwarf::DW_AT_low_pc, dwarf::DW_FORM_addr,<br>
@@ -803,7 +804,7 @@<br>
LexicalScope *Scope =<br>
new LexicalScope(NULL, DIDescriptor(SP), NULL, false);<br>
DeadFnScopeMap[SP] = Scope;<br>
-<br>
+<br>
// Construct subprogram DIE and add variables DIEs.<br>
CompileUnit *SPCU = CUMap.lookup(TheCU);<br>
assert(SPCU && "Unable to find Compile Unit!");<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>