[llvm] r192861 - Add the subprogram DIEs to the context they're created with only
Eric Christopher
echristo at gmail.com
Thu Oct 24 16:14:37 PDT 2013
On Tue, Oct 22, 2013 at 5:27 PM, Manman Ren <manman.ren at gmail.com> wrote:
>
>
> Hi Eric,
> Are we trying to add all SP definitions to the CU die directly? If we are,
> should we use if(SP.isDefinition()) instead of if(DeclDie) in the code
> snippet?
>
We are... it's a bit convoluted at the moment though.
>
> @@ -1333,9 +1330,15 @@ DIE *CompileUnit::getOrCreateSubprogramD
> if (DeclDie) {
>
> // Refer function declaration directly.
> addDIEEntry(SPDie, dwarf::DW_AT_specification, DeclDie);
>
> + // Add subprogram definitions to the CU die directly.
> + CUDie.get()->addChild(SPDie);
> +
> return SPDie;
> }
>
> There are cases where we have a SP definition with a null declaration
> field.
>
>
Are you sure? Do you have an example?
-eric
> Manman
>
>
> On Wed, Oct 16, 2013 at 6:31 PM, Eric Christopher <echristo at gmail.com>wrote:
>
>> Author: echristo
>> Date: Wed Oct 16 20:31:12 2013
>> New Revision: 192861
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=192861&view=rev
>> Log:
>> Add the subprogram DIEs to the context they're created with only
>> if they're a declaration, otherwise they're owned by the compile
>> unit.
>>
>> Modified:
>> llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
>> llvm/trunk/test/DebugInfo/X86/template.ll
>>
>> Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=192861&r1=192860&r2=192861&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)
>> +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Wed Oct 16
>> 20:31:12 2013
>> @@ -1321,9 +1321,6 @@ DIE *CompileUnit::getOrCreateSubprogramD
>> DeclDie = getOrCreateSubprogramDIE(SPDecl);
>> }
>>
>> - // Add to context owner.
>> - ContextDIE->addChild(SPDie);
>> -
>> // Add function template parameters.
>> addTemplateParams(*SPDie, SP.getTemplateParams());
>>
>> @@ -1333,9 +1330,15 @@ DIE *CompileUnit::getOrCreateSubprogramD
>> // Refer function declaration directly.
>> addDIEEntry(SPDie, dwarf::DW_AT_specification, DeclDie);
>>
>> + // Add subprogram definitions to the CU die directly.
>> + CUDie.get()->addChild(SPDie);
>> +
>> return SPDie;
>> }
>>
>> + // Add to context owner.
>> + ContextDIE->addChild(SPDie);
>> +
>> // Add the linkage name if we have one.
>> StringRef LinkageName = SP.getLinkageName();
>> if (!LinkageName.empty())
>>
>> Modified: llvm/trunk/test/DebugInfo/X86/template.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/template.ll?rev=192861&r1=192860&r2=192861&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/DebugInfo/X86/template.ll (original)
>> +++ llvm/trunk/test/DebugInfo/X86/template.ll Wed Oct 16 20:31:12 2013
>> @@ -17,6 +17,9 @@
>> ; CHECK-NOT: NULL
>> ; CHECK: DW_TAG_template_type_parameter
>>
>> +; CHECK: [[INTPTR:0x[0-9a-f]*]]:{{ *}}DW_TAG_pointer_type
>> +; CHECK-NEXT: DW_AT_type{{.*}} => {[[INT]]}
>> +
>> ; CHECK: DW_AT_name{{.*}}"func<3, &glbl, y_impl, 1, 2>"
>> ; CHECK-NOT: NULL
>> ; CHECK: DW_TAG_template_value_parameter
>> @@ -30,7 +33,7 @@
>> ; CHECK-NEXT: DW_AT_const_value [DW_FORM_sdata]{{.*}}(3)
>>
>> ; CHECK: DW_TAG_template_value_parameter
>> -; CHECK-NEXT: DW_AT_type{{.*}}=> {[[INTPTR:0x[0-9a-f]*]]}
>> +; CHECK-NEXT: DW_AT_type{{.*}}=> {[[INTPTR]]}
>>
>> ; The address of the global 'glbl', followed by DW_OP_stack_value (9f),
>> to use
>> ; the value immediately, rather than indirecting through the address.
>> @@ -53,9 +56,6 @@
>> ; CHECK-NEXT: DW_AT_type{{.*}}=> {[[INT]]}
>> ; CHECK-NEXT: DW_AT_const_value [DW_FORM_sdata]{{.*}}(2)
>>
>> -; CHECK: [[INTPTR]]:{{ *}}DW_TAG_pointer_type
>> -; CHECK-NEXT: DW_AT_type{{.*}} => {[[INT]]}
>> -
>> %"struct.y_impl<int>::nested" = type { i8 }
>>
>> @glbl = global i32 0, align 4
>> @@ -64,65 +64,62 @@
>>
>> define internal void @__cxx_global_var_init() section ".text.startup" {
>> entry:
>> - %call = call i32 @_Z4funcILi3EXadL_Z4glblEE6y_implJLi1ELi2EEEiv(),
>> !dbg !37
>> - store i32 %call, i32* @glbl, align 4, !dbg !37
>> - ret void, !dbg !37
>> + %call = call i32 @_Z4funcILi3EXadL_Z4glblEE6y_implJLi1ELi2EEEiv(),
>> !dbg !33
>> + store i32 %call, i32* @glbl, align 4, !dbg !33
>> + ret void, !dbg !33
>> }
>>
>> ; Function Attrs: nounwind uwtable
>> define linkonce_odr i32 @_Z4funcILi3EXadL_Z4glblEE6y_implJLi1ELi2EEEiv()
>> #0 {
>> entry:
>> - ret i32 3, !dbg !38
>> + ret i32 3, !dbg !34
>> }
>>
>> define internal void @_GLOBAL__I_a() section ".text.startup" {
>> entry:
>> - call void @__cxx_global_var_init(), !dbg !39
>> - ret void, !dbg !39
>> + call void @__cxx_global_var_init(), !dbg !35
>> + ret void, !dbg !35
>> }
>>
>> -attributes #0 = { nounwind uwtable "less-precise-fpmad"="false"
>> "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf"="true"
>> "no-infs-fp-math"="false" "no-nans-fp-math"="false"
>> "stack-protector-buffer-size"="8" "unsafe-fp-math"="false"
>> "use-soft-float"="false" }
>> +attributes #0 = { nounwind uwtable "less-precise-fpmad"="false"
>> "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf"
>> "no-infs-fp-math"="false" "no-nans-fp-math"="false"
>> "stack-protector-buffer-size"="8" "unsafe-fp-math"="false"
>> "use-soft-float"="false" }
>>
>> !llvm.dbg.cu = !{!0}
>> -!llvm.module.flags = !{!36}
>> +!llvm.module.flags = !{!31}
>> +!llvm.ident = !{!32}
>>
>> -!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version
>> 3.4 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata
>> !3, metadata !23, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ]
>> [/tmp/templ.cpp] [DW_LANG_C_plus_plus]
>> -!1 = metadata !{metadata !"templ.cpp", metadata !"/tmp"}
>> +!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version
>> 3.4 (trunk 192849) (llvm/trunk 192850)", i1 false, metadata !"", i32 0,
>> metadata !2, metadata !3, metadata !9, metadata !28, metadata !2, metadata
>> !""} ; [ DW_TAG_compile_unit ]
>> [/usr/local/google/home/echristo/tmp/bar.cpp] [DW_LANG_C_plus_plus]
>> +!1 = metadata !{metadata !"bar.cpp", metadata
>> !"/usr/local/google/home/echristo/tmp"}
>> !2 = metadata !{i32 0}
>> -!3 = metadata !{metadata !4, metadata !8, metadata !21}
>> -!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata
>> !"__cxx_global_var_init", metadata !"__cxx_global_var_init", metadata !"",
>> i32 3, metadata !6, i1 true, i1 true, i32 0, i32 0, null, i32 256, i1
>> false, void ()* @__cxx_global_var_init, null, null, metadata !2, i32 3} ; [
>> DW_TAG_subprogram ] [line 3] [local] [def] [__cxx_global_var_init]
>> -!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ]
>> [/tmp/templ.cpp]
>> -!6 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64
>> 0, i64 0, i32 0, null, metadata !7, i32 0, null, null, null} ; [
>> DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
>> -!7 = metadata !{null}
>> -!8 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"func<3,
>> &glbl, y_impl, 1, 2>", metadata !"func<3, &glbl, y_impl, 1, 2>", metadata
>> !"_Z4funcILi3EXadL_Z4glblEE6y_implJLi1ELi2EEEiv", i32 1, metadata !9, i1
>> false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 ()*
>> @_Z4funcILi3EXadL_Z4glblEE6y_implJLi1ELi2EEEiv, metadata !12, null,
>> metadata !2, i32 1} ; [ DW_TAG_subprogram ] [line 1] [def] [func<3, &glbl,
>> y_impl, 1, 2>]
>> -!9 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64
>> 0, i64 0, i32 0, null, metadata !10, i32 0, null, null, null} ; [
>> DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
>> -!10 = metadata !{metadata !11}
>> -!11 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32,
>> i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32,
>> align 32, offset 0, enc DW_ATE_signed]
>> -!12 = metadata !{metadata !13, metadata !14, metadata !16, metadata !17}
>> -!13 = metadata !{i32 786480, null, metadata !"x", metadata !11, i32 3,
>> null, i32 0, i32 0} ; [ DW_TAG_template_value_parameter ]
>> -!14 = metadata !{i32 786480, null, metadata !"", metadata !15, i32*
>> @glbl, null, i32 0, i32 0} ; [ DW_TAG_template_value_parameter ]
>> -!15 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64,
>> i64 64, i64 0, i32 0, metadata !11} ; [ DW_TAG_pointer_type ] [line 0, size
>> 64, align 64, offset 0] [from int]
>> -!16 = metadata !{i32 803078, null, metadata !"y", null, metadata
>> !"y_impl", null, i32 0, i32 0} ; [ DW_TAG_GNU_template_template_param ]
>> -!17 = metadata !{i32 803079, null, metadata !"z", null, metadata !18,
>> null, i32 0, i32 0} ; [ DW_TAG_GNU_template_parameter_pack ]
>> -!18 = metadata !{metadata !19, metadata !20}
>> -!19 = metadata !{i32 786480, null, metadata !"", metadata !11, i32 1,
>> null, i32 0, i32 0} ; [ DW_TAG_template_value_parameter ]
>> -!20 = metadata !{i32 786480, null, metadata !"", metadata !11, i32 2,
>> null, i32 0, i32 0} ; [ DW_TAG_template_value_parameter ]
>> -!21 = metadata !{i32 786478, metadata !1, metadata !5, metadata
>> !"_GLOBAL__I_a", metadata !"_GLOBAL__I_a", metadata !"", i32 1, metadata
>> !22, i1 true, i1 true, i32 0, i32 0, null, i32 64, i1 false, void ()*
>> @_GLOBAL__I_a, null, null, metadata !2, i32 1} ; [ DW_TAG_subprogram ]
>> [line 1] [local] [def] [_GLOBAL__I_a]
>> -!22 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0,
>> i64 0, i64 0, i32 0, null, metadata !2, i32 0, null, null, null} ; [
>> DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
>> +!3 = metadata !{metadata !4, metadata !8}
>> +!4 = metadata !{i32 786451, metadata !1, null, metadata !"y_impl<int>",
>> i32 2, i64 8, i64 8, i32 0, i32 0, null, metadata !2, i32 0, null, metadata
>> !5, metadata !"_ZTS6y_implIiE"} ; [ DW_TAG_structure_type ] [y_impl<int>]
>> [line 2, size 8, align 8, offset 0] [def] [from ]
>> +!5 = metadata !{metadata !6}
>> +!6 = metadata !{i32 786479, null, metadata !"", metadata !7, null, i32
>> 0, i32 0} ; [ DW_TAG_template_type_parameter ]
>> +!7 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32,
>> i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32,
>> align 32, offset 0, enc DW_ATE_signed]
>> +!8 = metadata !{i32 786451, metadata !1, metadata !"_ZTS6y_implIiE",
>> metadata !"nested", i32 2, i64 8, i64 8, i32 0, i32 0, null, metadata !2,
>> i32 0, null, null, metadata !"_ZTSN6y_implIiE6nestedE"} ; [
>> DW_TAG_structure_type ] [nested] [line 2, size 8, align 8, offset 0] [def]
>> [from ]
>> +!9 = metadata !{metadata !10, metadata !14, metadata !26}
>> +!10 = metadata !{i32 786478, metadata !1, metadata !11, metadata
>> !"__cxx_global_var_init", metadata !"__cxx_global_var_init", metadata !"",
>> i32 3, metadata !12, i1 true, i1 true, i32 0, i32 0, null, i32 256, i1
>> false, void ()* @__cxx_global_var_init, null, null, metadata !2, i32 3} ; [
>> DW_TAG_subprogram ] [line 3] [local] [def] [__cxx_global_var_init]
>> +!11 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ]
>> [/usr/local/google/home/echristo/tmp/bar.cpp]
>> +!12 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0,
>> i64 0, i64 0, i32 0, null, metadata !13, i32 0, null, null, null} ; [
>> DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
>> +!13 = metadata !{null}
>> +!14 = metadata !{i32 786478, metadata !1, metadata !11, metadata
>> !"func<3, &glbl, y_impl, 1, 2>", metadata !"func<3, &glbl, y_impl, 1, 2>",
>> metadata !"_Z4funcILi3EXadL_Z4glblEE6y_implJLi1ELi2EEEiv", i32 1, metadata
>> !15, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 ()*
>> @_Z4funcILi3EXadL_Z4glblEE6y_implJLi1ELi2EEEiv, metadata !17, null,
>> metadata !2, i32 1} ; [ DW_TAG_subprogram ] [line 1] [def] [func<3, &glbl,
>> y_impl, 1, 2>]
>> +!15 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0,
>> i64 0, i64 0, i32 0, null, metadata !16, i32 0, null, null, null} ; [
>> DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
>> +!16 = metadata !{metadata !7}
>> +!17 = metadata !{metadata !18, metadata !19, metadata !21, metadata !22}
>> +!18 = metadata !{i32 786480, null, metadata !"x", metadata !7, i32 3,
>> null, i32 0, i32 0} ; [ DW_TAG_template_value_parameter ]
>> +!19 = metadata !{i32 786480, null, metadata !"", metadata !20, i32*
>> @glbl, null, i32 0, i32 0} ; [ DW_TAG_template_value_parameter ]
>> +!20 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64,
>> i64 64, i64 0, i32 0, metadata !7} ; [ DW_TAG_pointer_type ] [line 0, size
>> 64, align 64, offset 0] [from int]
>> +!21 = metadata !{i32 803078, null, metadata !"y", null, metadata
>> !"y_impl", null, i32 0, i32 0} ; [ DW_TAG_GNU_template_template_param ]
>> +!22 = metadata !{i32 803079, null, metadata !"z", null, metadata !23,
>> null, i32 0, i32 0} ; [ DW_TAG_GNU_template_parameter_pack ]
>> !23 = metadata !{metadata !24, metadata !25}
>> -!24 = metadata !{i32 786484, i32 0, null, metadata !"glbl", metadata
>> !"glbl", metadata !"", metadata !5, i32 3, metadata !11, i32 0, i32 1, i32*
>> @glbl, null} ; [ DW_TAG_variable ] [glbl] [line 3] [def]
>> -!25 = metadata !{i32 786484, i32 0, null, metadata !"n", metadata !"n",
>> metadata !"", metadata !5, i32 4, metadata !26, i32 0, i32 1,
>> %"struct.y_impl<int>::nested"* @n, null} ; [ DW_TAG_variable ] [n] [line 4]
>> [def]
>> -!26 = metadata !{i32 786451, metadata !1, metadata !27, metadata
>> !"nested", i32 2, i64 8, i64 8, i32 0, i32 0, null, metadata !30, i32 0,
>> null, null, null} ; [ DW_TAG_structure_type ] [nested] [line 2, size 8,
>> align 8, offset 0] [def] [from ]
>> -!27 = metadata !{i32 786451, metadata !1, null, metadata !"y_impl<int>",
>> i32 2, i64 8, i64 8, i32 0, i32 0, null, null, i32 0, null, metadata !28,
>> null} ; [ DW_TAG_structure_type ] [y_impl<int>] [line 2, size 8, align 8,
>> offset 0] [def] [from ]
>> -!28 = metadata !{metadata !29}
>> -!29 = metadata !{i32 786479, null, metadata !"", metadata !11, null, i32
>> 0, i32 0} ; [ DW_TAG_template_type_parameter ]
>> -!30 = metadata !{metadata !31}
>> -!31 = metadata !{i32 786478, metadata !1, metadata !26, metadata
>> !"nested", metadata !"nested", metadata !"", i32 2, metadata !32, i1 false,
>> i1 false, i32 0, i32 0, null, i32 320, i1 false, null, null, i32 0,
>> metadata !35, i32 2} ; [ DW_TAG_subprogram ] [line 2] [nested]
>> -!32 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0,
>> i64 0, i64 0, i32 0, null, metadata !33, i32 0, null, null, null} ; [
>> DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
>> -!33 = metadata !{null, metadata !34}
>> -!34 = metadata !{i32 786447, i32 0, null, metadata !"", i32 0, i64 64,
>> i64 64, i64 0, i32 1088, metadata !26} ; [ DW_TAG_pointer_type ] [line 0,
>> size 64, align 64, offset 0] [artificial] [from nested]
>> -!35 = metadata !{i32 786468}
>> -!36 = metadata !{i32 2, metadata !"Dwarf Version", i32 3}
>> -!37 = metadata !{i32 3, i32 0, metadata !4, null}
>> -!38 = metadata !{i32 1, i32 0, metadata !8, null}
>> -!39 = metadata !{i32 1, i32 0, metadata !21, null}
>> +!24 = metadata !{i32 786480, null, metadata !"", metadata !7, i32 1,
>> null, i32 0, i32 0} ; [ DW_TAG_template_value_parameter ]
>> +!25 = metadata !{i32 786480, null, metadata !"", metadata !7, i32 2,
>> null, i32 0, i32 0} ; [ DW_TAG_template_value_parameter ]
>> +!26 = metadata !{i32 786478, metadata !1, metadata !11, metadata !"",
>> metadata !"", metadata !"_GLOBAL__I_a", i32 1, metadata !27, i1 true, i1
>> true, i32 0, i32 0, null, i32 64, i1 false, void ()* @_GLOBAL__I_a, null,
>> null, metadata !2, i32 1} ; [ DW_TAG_subprogram ] [line 1] [local] [def]
>> +!27 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0,
>> i64 0, i64 0, i32 0, null, metadata !2, i32 0, null, null, null} ; [
>> DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
>> +!28 = metadata !{metadata !29, metadata !30}
>> +!29 = metadata !{i32 786484, i32 0, null, metadata !"glbl", metadata
>> !"glbl", metadata !"", metadata !11, i32 3, metadata !7, i32 0, i32 1, i32*
>> @glbl, null} ; [ DW_TAG_variable ] [glbl] [line 3] [def]
>> +!30 = metadata !{i32 786484, i32 0, null, metadata !"n", metadata !"n",
>> metadata !"", metadata !11, i32 4, metadata !8, i32 0, i32 1,
>> %"struct.y_impl<int>::nested"* @n, null} ; [ DW_TAG_variable ] [n] [line 4]
>> [def]
>> +!31 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}
>> +!32 = metadata !{metadata !"clang version 3.4 (trunk 192849) (llvm/trunk
>> 192850)"}
>> +!33 = metadata !{i32 3, i32 0, metadata !10, null}
>> +!34 = metadata !{i32 1, i32 0, metadata !14, null}
>> +!35 = metadata !{i32 1, i32 0, metadata !26, null}
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20131024/20729800/attachment.html>
More information about the llvm-commits
mailing list