From: David Blaikie Date: Tue, 14 Apr 2015 18:08:25 +0000 (+0000) Subject: DebugInfo: Pubnames: Do not include variable declarations in pubnames X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=8b37471825d267ffd5d64d897b71d39f1bf82db4 DebugInfo: Pubnames: Do not include variable declarations in pubnames This causes badness for GDB which expects to find a definition in any compile_unit that has an entry for the variable in its pubnames. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@234915 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp index 555d40bb8c2..d3097a16cc5 100644 --- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp @@ -137,6 +137,8 @@ DIE *DwarfCompileUnit::getOrCreateGlobalVariableDIE(DIGlobalVariable GV) { if (!GV->isDefinition()) addFlag(*VariableDIE, dwarf::DW_AT_declaration); + else + addGlobalName(GV->getName(), *VariableDIE, DeclContext); // Add location. bool addToAccelTable = false; @@ -202,7 +204,6 @@ DIE *DwarfCompileUnit::getOrCreateGlobalVariableDIE(DIGlobalVariable GV) { DD->addAccelName(GV->getLinkageName(), *VariableDIE); } - addGlobalName(GV->getName(), *VariableDIE, DeclContext); return VariableDIE; } diff --git a/test/DebugInfo/X86/gnu-public-names.ll b/test/DebugInfo/X86/gnu-public-names.ll index 7e4cc484bb4..e57b3eba2be 100644 --- a/test/DebugInfo/X86/gnu-public-names.ll +++ b/test/DebugInfo/X86/gnu-public-names.ll @@ -31,10 +31,38 @@ ; global_variable.member_function(); ; } ; int global_namespace_variable = 1; +; extern int global_namespace_variable_decl; ; struct D { ; int A; ; } d; ; } +; +; using ns::global_namespace_variable_decl; +; +; namespace { +; int i; +; } +; +; int *f3() { +; static int z; +; return &z; +; } +; +; namespace { +; namespace inner { +; int b; +; } +; } +; +; namespace outer { +; namespace { +; int c; +; } +; } +; +; int f7() { +; return i + *f3() + inner::b + outer::c; +; } ; ASM: .section .debug_gnu_pubnames ; ASM: .byte 32 # Kind: VARIABLE, EXTERNAL @@ -149,6 +177,9 @@ ; CHECK: NULL ; CHECK-NOT: {{DW_TAG|NULL}} +; CHECK: DW_TAG_imported_declaration +; CHECK-NOT: {{DW_TAG|NULL}} + ; CHECK: [[MEM_FUNC:0x[0-9a-f]+]]: DW_TAG_subprogram ; CHECK-NOT: DW_TAG ; CHECK: DW_AT_specification {{.*}} "_ZN1C15member_functionEv" @@ -166,29 +197,28 @@ ; CHECK-LABEL: .debug_gnu_pubnames contents: ; CHECK-NEXT: length = {{.*}} version = 0x0002 unit_offset = 0x00000000 unit_size = {{.*}} ; CHECK-NEXT: Offset Linkage Kind Name -; CHECK-DAG: [[GLOBAL_FUNC]] EXTERNAL FUNCTION "global_function" -; CHECK-DAG: [[NS]] EXTERNAL TYPE "ns" -; CHECK-DAG: [[MEM_FUNC]] EXTERNAL FUNCTION "C::member_function" -; CHECK-DAG: [[GLOB_VAR]] EXTERNAL VARIABLE "global_variable" -; CHECK-DAG: [[GLOB_NS_VAR]] EXTERNAL VARIABLE "ns::global_namespace_variable" -; CHECK-DAG: [[GLOB_NS_FUNC]] EXTERNAL FUNCTION "ns::global_namespace_function" -; CHECK-DAG: [[D_VAR]] EXTERNAL VARIABLE "ns::d" -; CHECK-DAG: [[STATIC_MEM_VAR]] EXTERNAL VARIABLE "C::static_member_variable" -; CHECK-DAG: [[STATIC_MEM_FUNC]] EXTERNAL FUNCTION "C::static_member_function" -; CHECK-DAG: [[ANON]] EXTERNAL TYPE "(anonymous namespace)" -; CHECK-DAG: [[ANON_INNER]] EXTERNAL TYPE "(anonymous namespace)::inner" -; CHECK-DAG: [[OUTER]] EXTERNAL TYPE "outer" -; CHECK-DAG: [[OUTER_ANON]] EXTERNAL TYPE "outer::(anonymous namespace)" -; CHECK-DAG: [[ANON_I]] STATIC VARIABLE "(anonymous namespace)::i" -; CHECK-DAG: [[ANON_INNER_B]] STATIC VARIABLE "(anonymous namespace)::inner::b" -; CHECK-DAG: [[OUTER_ANON_C]] STATIC VARIABLE "outer::(anonymous namespace)::c" - +; CHECK-NEXT: [[GLOBAL_FUNC]] EXTERNAL FUNCTION "global_function" +; CHECK-NEXT: [[NS]] EXTERNAL TYPE "ns" +; CHECK-NEXT: [[OUTER_ANON_C]] STATIC VARIABLE "outer::(anonymous namespace)::c" +; CHECK-NEXT: [[ANON_I]] STATIC VARIABLE "(anonymous namespace)::i" ; GCC Doesn't put local statics in pubnames, but it seems not unreasonable and ; comes out naturally from LLVM's implementation, so I'm OK with it for now. If ; it's demonstrated that this is a major size concern or degrades debug info ; consumer behavior, feel free to change it. +; CHECK-NEXT: [[F3_Z]] STATIC VARIABLE "f3::z" +; CHECK-NEXT: [[ANON]] EXTERNAL TYPE "(anonymous namespace)" +; CHECK-NEXT: [[OUTER_ANON]] EXTERNAL TYPE "outer::(anonymous namespace)" +; CHECK-NEXT: [[ANON_INNER_B]] STATIC VARIABLE "(anonymous namespace)::inner::b" +; CHECK-NEXT: [[OUTER]] EXTERNAL TYPE "outer" +; CHECK-NEXT: [[MEM_FUNC]] EXTERNAL FUNCTION "C::member_function" +; CHECK-NEXT: [[GLOB_VAR]] EXTERNAL VARIABLE "global_variable" +; CHECK-NEXT: [[GLOB_NS_VAR]] EXTERNAL VARIABLE "ns::global_namespace_variable" +; CHECK-NEXT: [[ANON_INNER]] EXTERNAL TYPE "(anonymous namespace)::inner" +; CHECK-NEXT: [[D_VAR]] EXTERNAL VARIABLE "ns::d" +; CHECK-NEXT: [[GLOB_NS_FUNC]] EXTERNAL FUNCTION "ns::global_namespace_function" +; CHECK-NEXT: [[STATIC_MEM_VAR]] EXTERNAL VARIABLE "C::static_member_variable" +; CHECK-NEXT: [[STATIC_MEM_FUNC]] EXTERNAL FUNCTION "C::static_member_function" -; CHECK-DAG: [[F3_Z]] STATIC VARIABLE "f3::z" ; CHECK-LABEL: debug_gnu_pubtypes contents: @@ -214,10 +244,10 @@ define void @_ZN1C15member_functionEv(%struct.C* %this) #0 align 2 { entry: %this.addr = alloca %struct.C*, align 8 store %struct.C* %this, %struct.C** %this.addr, align 8 - call void @llvm.dbg.declare(metadata %struct.C** %this.addr, metadata !49, metadata !51), !dbg !52 + call void @llvm.dbg.declare(metadata %struct.C** %this.addr, metadata !51, metadata !53), !dbg !54 %this1 = load %struct.C*, %struct.C** %this.addr - store i32 0, i32* @_ZN1C22static_member_variableE, align 4, !dbg !53 - ret void, !dbg !54 + store i32 0, i32* @_ZN1C22static_member_variableE, align 4, !dbg !55 + ret void, !dbg !56 } ; Function Attrs: nounwind readnone @@ -226,51 +256,51 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) #1 ; Function Attrs: nounwind uwtable define i32 @_ZN1C22static_member_functionEv() #0 align 2 { entry: - %0 = load i32, i32* @_ZN1C22static_member_variableE, align 4, !dbg !55 - ret i32 %0, !dbg !55 + %0 = load i32, i32* @_ZN1C22static_member_variableE, align 4, !dbg !57 + ret i32 %0, !dbg !57 } ; Function Attrs: nounwind uwtable define i32 @_Z15global_functionv() #0 { entry: - ret i32 -1, !dbg !56 + ret i32 -1, !dbg !58 } ; Function Attrs: nounwind uwtable define void @_ZN2ns25global_namespace_functionEv() #0 { entry: - call void @_ZN1C15member_functionEv(%struct.C* @global_variable), !dbg !57 - ret void, !dbg !58 + call void @_ZN1C15member_functionEv(%struct.C* @global_variable), !dbg !59 + ret void, !dbg !60 } ; Function Attrs: nounwind uwtable define i32* @_Z2f3v() #0 { entry: - ret i32* @_ZZ2f3vE1z, !dbg !59 + ret i32* @_ZZ2f3vE1z, !dbg !61 } ; Function Attrs: nounwind uwtable define i32 @_Z2f7v() #0 { entry: - %0 = load i32, i32* @_ZN12_GLOBAL__N_11iE, align 4, !dbg !60 - %call = call i32* @_Z2f3v(), !dbg !60 - %1 = load i32, i32* %call, align 4, !dbg !60 - %add = add nsw i32 %0, %1, !dbg !60 - %2 = load i32, i32* @_ZN12_GLOBAL__N_15inner1bE, align 4, !dbg !60 - %add1 = add nsw i32 %add, %2, !dbg !60 - %3 = load i32, i32* @_ZN5outer12_GLOBAL__N_11cE, align 4, !dbg !60 - %add2 = add nsw i32 %add1, %3, !dbg !60 - ret i32 %add2, !dbg !60 + %0 = load i32, i32* @_ZN12_GLOBAL__N_11iE, align 4, !dbg !62 + %call = call i32* @_Z2f3v(), !dbg !62 + %1 = load i32, i32* %call, align 4, !dbg !62 + %add = add nsw i32 %0, %1, !dbg !62 + %2 = load i32, i32* @_ZN12_GLOBAL__N_15inner1bE, align 4, !dbg !62 + %add1 = add nsw i32 %add, %2, !dbg !62 + %3 = load i32, i32* @_ZN5outer12_GLOBAL__N_11cE, align 4, !dbg !62 + %add2 = add nsw i32 %add1, %3, !dbg !62 + ret i32 %add2, !dbg !62 } 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" "target-cpu"="x86-64" "unsafe-fp-math"="false" "use-soft-float"="false" } attributes #1 = { nounwind readnone } !llvm.dbg.cu = !{!0} -!llvm.module.flags = !{!46, !47} -!llvm.ident = !{!48} +!llvm.module.flags = !{!48, !49} +!llvm.ident = !{!50} -!0 = !MDCompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 3.7.0 (trunk 234754) (llvm/trunk 234760)", isOptimized: false, runtimeVersion: 0, emissionKind: 1, enums: !2, retainedTypes: !3, subprograms: !19, globals: !31, imports: !44) +!0 = !MDCompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 3.7.0 (trunk 234897) (llvm/trunk 234911)", isOptimized: false, runtimeVersion: 0, emissionKind: 1, enums: !2, retainedTypes: !3, subprograms: !19, globals: !31, imports: !44) !1 = !MDFile(filename: "gnu-public-names.cpp", directory: "/tmp/dbginfo") !2 = !{} !3 = !{!4, !15} @@ -285,10 +315,10 @@ attributes #1 = { nounwind readnone } !12 = !MDSubprogram(name: "static_member_function", linkageName: "_ZN1C22static_member_functionEv", scope: !"_ZTS1C", file: !1, line: 3, type: !13, isLocal: false, isDefinition: false, scopeLine: 3, flags: DIFlagPrototyped, isOptimized: false) !13 = !MDSubroutineType(types: !14) !14 = !{!7} -!15 = !MDCompositeType(tag: DW_TAG_structure_type, name: "D", scope: !16, file: !1, line: 28, size: 32, align: 32, elements: !17, identifier: "_ZTSN2ns1DE") +!15 = !MDCompositeType(tag: DW_TAG_structure_type, name: "D", scope: !16, file: !1, line: 29, size: 32, align: 32, elements: !17, identifier: "_ZTSN2ns1DE") !16 = !MDNamespace(name: "ns", scope: null, file: !1, line: 23) !17 = !{!18} -!18 = !MDDerivedType(tag: DW_TAG_member, name: "A", scope: !"_ZTSN2ns1DE", file: !1, line: 29, baseType: !7, size: 32, align: 32) +!18 = !MDDerivedType(tag: DW_TAG_member, name: "A", scope: !"_ZTSN2ns1DE", file: !1, line: 30, baseType: !7, size: 32, align: 32) !19 = !{!20, !21, !22, !23, !26, !30} !20 = !MDSubprogram(name: "member_function", linkageName: "_ZN1C15member_functionEv", scope: !"_ZTS1C", file: !1, line: 9, type: !9, isLocal: false, isDefinition: true, scopeLine: 9, flags: DIFlagPrototyped, isOptimized: false, function: void (%struct.C*)* @_ZN1C15member_functionEv, declaration: !8, variables: !2) !21 = !MDSubprogram(name: "static_member_function", linkageName: "_ZN1C22static_member_functionEv", scope: !"_ZTS1C", file: !1, line: 13, type: !13, isLocal: false, isDefinition: true, scopeLine: 13, flags: DIFlagPrototyped, isOptimized: false, function: i32 ()* @_ZN1C22static_member_functionEv, declaration: !12, variables: !2) @@ -296,38 +326,40 @@ attributes #1 = { nounwind readnone } !23 = !MDSubprogram(name: "global_namespace_function", linkageName: "_ZN2ns25global_namespace_functionEv", scope: !16, file: !1, line: 24, type: !24, isLocal: false, isDefinition: true, scopeLine: 24, flags: DIFlagPrototyped, isOptimized: false, function: void ()* @_ZN2ns25global_namespace_functionEv, variables: !2) !24 = !MDSubroutineType(types: !25) !25 = !{null} -!26 = !MDSubprogram(name: "f3", linkageName: "_Z2f3v", scope: !1, file: !1, line: 37, type: !27, isLocal: false, isDefinition: true, scopeLine: 37, flags: DIFlagPrototyped, isOptimized: false, function: i32* ()* @_Z2f3v, variables: !2) +!26 = !MDSubprogram(name: "f3", linkageName: "_Z2f3v", scope: !1, file: !1, line: 40, type: !27, isLocal: false, isDefinition: true, scopeLine: 40, flags: DIFlagPrototyped, isOptimized: false, function: i32* ()* @_Z2f3v, variables: !2) !27 = !MDSubroutineType(types: !28) !28 = !{!29} !29 = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64, align: 64) -!30 = !MDSubprogram(name: "f7", linkageName: "_Z2f7v", scope: !1, file: !1, line: 54, type: !13, isLocal: false, isDefinition: true, scopeLine: 54, flags: DIFlagPrototyped, isOptimized: false, function: i32 ()* @_Z2f7v, variables: !2) +!30 = !MDSubprogram(name: "f7", linkageName: "_Z2f7v", scope: !1, file: !1, line: 57, type: !13, isLocal: false, isDefinition: true, scopeLine: 57, flags: DIFlagPrototyped, isOptimized: false, function: i32 ()* @_Z2f7v, variables: !2) !31 = !{!32, !33, !34, !35, !36, !37, !39, !41} !32 = !MDGlobalVariable(name: "static_member_variable", linkageName: "_ZN1C22static_member_variableE", scope: !0, file: !1, line: 7, type: !7, isLocal: false, isDefinition: true, variable: i32* @_ZN1C22static_member_variableE, declaration: !6) !33 = !MDGlobalVariable(name: "global_variable", scope: !0, file: !1, line: 17, type: !"_ZTS1C", isLocal: false, isDefinition: true, variable: %struct.C* @global_variable) !34 = !MDGlobalVariable(name: "global_namespace_variable", linkageName: "_ZN2ns25global_namespace_variableE", scope: !16, file: !1, line: 27, type: !7, isLocal: false, isDefinition: true, variable: i32* @_ZN2ns25global_namespace_variableE) -!35 = !MDGlobalVariable(name: "d", linkageName: "_ZN2ns1dE", scope: !16, file: !1, line: 30, type: !"_ZTSN2ns1DE", isLocal: false, isDefinition: true, variable: %"struct.ns::D"* @_ZN2ns1dE) -!36 = !MDGlobalVariable(name: "z", scope: !26, file: !1, line: 38, type: !7, isLocal: true, isDefinition: true, variable: i32* @_ZZ2f3vE1z) -!37 = !MDGlobalVariable(name: "i", linkageName: "_ZN12_GLOBAL__N_11iE", scope: !38, file: !1, line: 34, type: !7, isLocal: true, isDefinition: true, variable: i32* @_ZN12_GLOBAL__N_11iE) -!38 = !MDNamespace(scope: null, file: !1, line: 33) -!39 = !MDGlobalVariable(name: "b", linkageName: "_ZN12_GLOBAL__N_15inner1bE", scope: !40, file: !1, line: 44, type: !7, isLocal: true, isDefinition: true, variable: i32* @_ZN12_GLOBAL__N_15inner1bE) -!40 = !MDNamespace(name: "inner", scope: !38, file: !1, line: 43) -!41 = !MDGlobalVariable(name: "c", linkageName: "_ZN5outer12_GLOBAL__N_11cE", scope: !42, file: !1, line: 50, type: !7, isLocal: true, isDefinition: true, variable: i32* @_ZN5outer12_GLOBAL__N_11cE) -!42 = !MDNamespace(scope: !43, file: !1, line: 49) -!43 = !MDNamespace(name: "outer", scope: null, file: !1, line: 48) -!44 = !{!45} -!45 = !MDImportedEntity(tag: DW_TAG_imported_module, scope: !43, entity: !42, line: 40) -!46 = !{i32 2, !"Dwarf Version", i32 4} -!47 = !{i32 2, !"Debug Info Version", i32 3} -!48 = !{!"clang version 3.7.0 (trunk 234754) (llvm/trunk 234760)"} -!49 = !MDLocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, scope: !20, type: !50, flags: DIFlagArtificial | DIFlagObjectPointer) -!50 = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS1C", size: 64, align: 64) -!51 = !MDExpression() -!52 = !MDLocation(line: 0, scope: !20) -!53 = !MDLocation(line: 10, scope: !20) -!54 = !MDLocation(line: 11, scope: !20) -!55 = !MDLocation(line: 14, scope: !21) -!56 = !MDLocation(line: 20, scope: !22) -!57 = !MDLocation(line: 25, scope: !23) -!58 = !MDLocation(line: 26, scope: !23) -!59 = !MDLocation(line: 39, scope: !26) -!60 = !MDLocation(line: 55, scope: !30) +!35 = !MDGlobalVariable(name: "d", linkageName: "_ZN2ns1dE", scope: !16, file: !1, line: 31, type: !"_ZTSN2ns1DE", isLocal: false, isDefinition: true, variable: %"struct.ns::D"* @_ZN2ns1dE) +!36 = !MDGlobalVariable(name: "z", scope: !26, file: !1, line: 41, type: !7, isLocal: true, isDefinition: true, variable: i32* @_ZZ2f3vE1z) +!37 = !MDGlobalVariable(name: "i", linkageName: "_ZN12_GLOBAL__N_11iE", scope: !38, file: !1, line: 37, type: !7, isLocal: true, isDefinition: true, variable: i32* @_ZN12_GLOBAL__N_11iE) +!38 = !MDNamespace(scope: null, file: !1, line: 36) +!39 = !MDGlobalVariable(name: "b", linkageName: "_ZN12_GLOBAL__N_15inner1bE", scope: !40, file: !1, line: 47, type: !7, isLocal: true, isDefinition: true, variable: i32* @_ZN12_GLOBAL__N_15inner1bE) +!40 = !MDNamespace(name: "inner", scope: !38, file: !1, line: 46) +!41 = !MDGlobalVariable(name: "c", linkageName: "_ZN5outer12_GLOBAL__N_11cE", scope: !42, file: !1, line: 53, type: !7, isLocal: true, isDefinition: true, variable: i32* @_ZN5outer12_GLOBAL__N_11cE) +!42 = !MDNamespace(scope: !43, file: !1, line: 52) +!43 = !MDNamespace(name: "outer", scope: null, file: !1, line: 51) +!44 = !{!45, !47} +!45 = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: !0, entity: !46, line: 34) +!46 = !MDGlobalVariable(name: "global_namespace_variable_decl", linkageName: "_ZN2ns30global_namespace_variable_declE", scope: !16, file: !1, line: 28, type: !7, isLocal: false, isDefinition: false) +!47 = !MDImportedEntity(tag: DW_TAG_imported_module, scope: !43, entity: !42, line: 43) +!48 = !{i32 2, !"Dwarf Version", i32 4} +!49 = !{i32 2, !"Debug Info Version", i32 3} +!50 = !{!"clang version 3.7.0 (trunk 234897) (llvm/trunk 234911)"} +!51 = !MDLocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, scope: !20, type: !52, flags: DIFlagArtificial | DIFlagObjectPointer) +!52 = !MDDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS1C", size: 64, align: 64) +!53 = !MDExpression() +!54 = !MDLocation(line: 0, scope: !20) +!55 = !MDLocation(line: 10, scope: !20) +!56 = !MDLocation(line: 11, scope: !20) +!57 = !MDLocation(line: 14, scope: !21) +!58 = !MDLocation(line: 20, scope: !22) +!59 = !MDLocation(line: 25, scope: !23) +!60 = !MDLocation(line: 26, scope: !23) +!61 = !MDLocation(line: 42, scope: !26) +!62 = !MDLocation(line: 58, scope: !30)