<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Oct 16, 2013 at 7:06 PM, Eric Christopher <span dir="ltr"><<a href="mailto:echristo@gmail.com" target="_blank">echristo@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: echristo<br>
Date: Wed Oct 16 21:06:06 2013<br>
New Revision: 192865<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=192865&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=192865&view=rev</a><br>
Log:<br>
According to the dwarf standard pubnames and pubtypes for languages<br>
like C++ should be the fully qualified names for the type.<br>
<br>
Add a routine that does a language specific context walk to build<br>
up the qualified name and use it when we add types/names to the<br>
tables. Expand the gnu pubnames testcase as it's the most complex<br>
to make sure that qualified types are also being added.<br>
<br>
Modified:<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>
llvm/trunk/test/DebugInfo/X86/gnu-public-names.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=192865&r1=192864&r2=192865&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=192865&r1=192864&r2=192865&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Wed Oct 16 21:06:06 2013<br>
@@ -911,8 +911,10 @@ void CompileUnit::addAccelType(StringRef<br>
}<br>
<br>
/// addGlobalName - Add a new global name to the compile unit.<br>
-void CompileUnit::addGlobalName(StringRef Name, DIE *Die) {<br>
- GlobalNames[Name] = Die;<br>
+void CompileUnit::addGlobalName(StringRef Name, DIE *Die, DIScope Context) {<br>
+ std::string ContextString = getParentContextString(Context);<br>
+ std::string FullName = ContextString + Name.str();<br></blockquote><div><br></div><div>premature optimizer says that this would avoid constructing a second/temporary string if it was:<br><br></div><div>std::string foo = getParentContextString(...);<br>
foo += Name.str();<br><br>or <br><br>std::string Fullname = getParentContextString(Context) + Name.str();<br><br>(at least the latter will work in C++11, invoking the move ctor)<br><br>But that's by no means necessary if you prefer the legibility of your original form.</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ GlobalNames[FullName] = Die;<br>
}<br>
<br>
/// addGlobalType - Add a new global type to the compile unit.<br>
@@ -922,8 +924,51 @@ void CompileUnit::addGlobalType(DIType T<br>
if (!Ty.getName().empty() && !Ty.isForwardDecl() &&<br>
(!Context || Context.isCompileUnit() || Context.isFile() ||<br>
Context.isNameSpace()))<br>
- if (DIEEntry *Entry = getDIEEntry(Ty))<br>
- GlobalTypes[Ty.getName()] = Entry->getEntry();<br>
+ if (DIEEntry *Entry = getDIEEntry(Ty)) {<br>
+ std::string ContextString = getParentContextString(Context);<br>
+ std::string FullName = ContextString + Ty.getName().str();<br>
+ GlobalTypes[FullName] = Entry->getEntry();<br></blockquote><div><br></div><div>Would it be better to implement these 3 lines with a call to addGlobalName(Ty.getName(), Entry->getEntry(), Context); ?</div><div>
</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ }<br>
+}<br>
+<br>
+/// getParentContextString - Walks the metadata parent chain in a language<br>
+/// specific manner (using the compile unit language) and returns<br>
+/// it as a string. This is done at the metadata level because DIEs may<br>
+/// not currently have been added to the parent context and walking the<br>
+/// DIEs looking for names is more expensive than walking the metadata.<br>
+std::string CompileUnit::getParentContextString(DIScope Context) const {<br>
+ if (!Context)<br>
+ return "";<br>
+<br>
+ // FIXME: Decide whether to implement this for non-C++ languages.<br>
+ if (getLanguage() != dwarf::DW_LANG_C_plus_plus)<br>
+ return "";<br>
+<br>
+ std::string CS = "";<br></blockquote><div><br></div><div>Probably no optimization problem here, but std::string CS; would be just as good.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ SmallVector<DIScope, 1> Parents;<br>
+ while (!Context.isCompileUnit()) {<br>
+ Parents.push_back(Context);<br>
+ if (Context.getContext())<br>
+ Context = resolve(Context.getContext());<br>
+ else<br>
+ // Structure, etc types will have a NULL context if they're at the top<br>
+ // level.<br>
+ break;<br>
+ }<br>
+<br>
+ // Reverse iterate over our list to go from the outermost construct to the<br>
+ // innermost.<br>
+ for (SmallVectorImpl<DIScope>::reverse_iterator I = Parents.rbegin(),<br>
+ E = Parents.rend();<br>
+ I != E; ++I) {<br>
+ DIScope Ctx = *I;<br>
+ StringRef Name = Ctx.getName();<br>
+ if (Name != "") {<br></blockquote><div><br></div><div>And !Name.empty(), perhaps? But again, reasonable people may disagree with me there.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ CS += Name;<br>
+ CS += "::";<br>
+ }<br>
+ }<br>
+ return CS;<br>
}<br>
<br>
/// addPubTypes - Add subprogram argument types for pubtypes section.<br>
@@ -1289,7 +1334,7 @@ DIE *CompileUnit::getOrCreateNameSpace(D<br>
if (!NS.getName().empty()) {<br>
addString(NDie, dwarf::DW_AT_name, NS.getName());<br>
addAccelNamespace(NS.getName(), NDie);<br>
- addGlobalName(NS.getName(), NDie);<br>
+ addGlobalName(NS.getName(), NDie, NS.getContext());<br>
} else<br>
addAccelNamespace("(anonymous namespace)", NDie);<br>
addSourceLine(NDie, NS);<br>
@@ -1571,8 +1616,8 @@ void CompileUnit::createGlobalVariableDI<br>
}<br>
<br>
if (!GV.isLocalToUnit())<br>
- addGlobalName(GV.getName(),<br>
- VariableSpecDIE ? VariableSpecDIE : VariableDIE);<br>
+ addGlobalName(GV.getName(), VariableSpecDIE ? VariableSpecDIE : VariableDIE,<br>
+ GV.getContext());<br>
}<br>
<br>
/// constructSubrangeDIE - Construct subrange DIE from DISubrange.<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h?rev=192865&r1=192864&r2=192865&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h?rev=192865&r1=192864&r2=192865&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h Wed Oct 16 21:06:06 2013<br>
@@ -123,9 +123,13 @@ public:<br>
///<br>
bool hasContent() const { return !CUDie->getChildren().empty(); }<br>
<br>
+ /// getParentContextString - Get a string containing the language specific<br>
+ /// context for a global name.<br>
+ std::string getParentContextString(DIScope Context) const;<br>
+<br>
/// addGlobalName - Add a new global entity to the compile unit.<br>
///<br>
- void addGlobalName(StringRef Name, DIE *Die);<br>
+ void addGlobalName(StringRef Name, DIE *Die, DIScope Context);<br>
<br>
/// addGlobalType - Add a new global type to the compile unit.<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=192865&r1=192864&r2=192865&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=192865&r1=192864&r2=192865&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Wed Oct 16 21:06:06 2013<br>
@@ -839,7 +839,7 @@ void DwarfDebug::constructSubprogramDIE(<br>
SPMap[N] = TheCU;<br>
<br>
// Expose as a global name.<br>
- TheCU->addGlobalName(SP.getName(), SubprogramDie);<br>
+ TheCU->addGlobalName(SP.getName(), SubprogramDie, resolve(SP.getContext()));<br>
}<br>
<br>
void DwarfDebug::constructImportedEntityDIE(CompileUnit *TheCU,<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll?rev=192865&r1=192864&r2=192865&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll?rev=192865&r1=192864&r2=192865&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll Wed Oct 16 21:06:06 2013<br>
@@ -31,11 +31,14 @@<br>
; global_variable.member_function();<br>
; }<br>
; int global_namespace_variable = 1;<br>
+; struct D {<br>
+; int A;<br>
+; } d;<br>
; }<br>
<br>
; ASM: .section .debug_gnu_pubnames<br>
; ASM: .byte 32 # Kind: VARIABLE, EXTERNAL<br>
-; ASM-NEXT: .asciz "global_namespace_variable" # External Name<br>
+; ASM-NEXT: .asciz "global_variable" # External Name<br>
<br>
; ASM: .section .debug_gnu_pubtypes<br>
; ASM: .byte 16 # Kind: TYPE, EXTERNAL<br>
@@ -74,6 +77,12 @@<br>
; CHECK: [[GLOB_NS_VAR_DECL:[0-9a-f]+]]: DW_TAG_variable<br>
; CHECK-NEXT: DW_AT_name {{.*}} "global_namespace_variable"<br>
<br>
+; CHECK: [[D:[0-9a-f]+]]: DW_TAG_structure_type<br>
+; CHECK-NEXT: DW_AT_name {{.*}} "D"<br>
+<br>
+; CHECK: [[D_VAR_DECL:[0-9a-f]+]]: DW_TAG_variable<br>
+; CHECK-NEXT: DW_AT_name {{.*}} "d"<br>
+<br>
; CHECK: [[GLOB_NS_FUNC:[0-9a-f]+]]: DW_TAG_subprogram<br>
; CHECK-NEXT: DW_AT_MIPS_linkage_name<br>
; CHECK-NEXT: DW_AT_name {{.*}} "global_namespace_function"<br>
@@ -81,6 +90,9 @@<br>
; CHECK: [[GLOB_NS_VAR:[0-9a-f]+]]: DW_TAG_variable<br>
; CHECK-NEXT: DW_AT_specification {{.*}}[[GLOB_NS_VAR_DECL]]<br>
<br>
+; CHECK: [[D_VAR:[0-9a-f]+]]: DW_TAG_variable<br>
+; CHECK-NEXT: DW_AT_specification {{.*}}[[D_VAR_DECL]]<br>
+<br>
; CHECK: [[MEM_FUNC:[0-9a-f]+]]: DW_TAG_subprogram<br>
; CHECK-NEXT: DW_AT_specification {{.*}}[[MEM_FUNC_DECL]]<br>
<br>
@@ -92,19 +104,21 @@<br>
; CHECK-NEXT: DW_AT_name {{.*}} "global_function"<br>
<br>
; CHECK-LABEL: .debug_gnu_pubnames contents:<br>
-; CHECK-NEXT: Length: 203<br>
+; CHECK-NEXT: Length: 231<br>
; CHECK-NEXT: Version: 2<br>
; CHECK-NEXT: Offset in .debug_info: 0<br>
-; CHECK-NEXT: Size: 327<br>
+; CHECK-NEXT: Size: 381<br>
; CHECK-NEXT: Offset Linkage Kind Name<br>
+; CHECK-DAG: [[GLOBAL_FUNC]] EXTERNAL FUNCTION "global_function"<br>
; CHECK-DAG: [[NS]] EXTERNAL TYPE "ns"<br>
-; CHECK-DAG: [[GLOB_NS_VAR]] EXTERNAL VARIABLE "global_namespace_variable"<br>
-; CHECK-DAG: [[GLOB_NS_FUNC]] EXTERNAL FUNCTION "global_namespace_function"<br>
-; CHECK-DAG: [[STATIC_MEM_VAR]] EXTERNAL VARIABLE "static_member_variable"<br>
-; CHECK-DAG: [[STATIC_MEM_FUNC]] EXTERNAL FUNCTION "static_member_function"<br>
+; CHECK-DAG: [[MEM_FUNC]] EXTERNAL FUNCTION "C::member_function"<br>
; CHECK-DAG: [[GLOB_VAR]] EXTERNAL VARIABLE "global_variable"<br>
-; CHECK-DAG: [[GLOBAL_FUNC]] EXTERNAL FUNCTION "global_function"<br>
-; CHECK-DAG: [[MEM_FUNC]] EXTERNAL FUNCTION "member_function"<br>
+; CHECK-DAG: [[GLOB_NS_VAR]] EXTERNAL VARIABLE "ns::global_namespace_variable"<br>
+; CHECK-DAG: [[GLOB_NS_FUNC]] EXTERNAL FUNCTION "ns::global_namespace_function"<br>
+; CHECK-DAG: [[D_VAR]] EXTERNAL VARIABLE "ns::d"<br>
+; CHECK-DAG: [[STATIC_MEM_VAR]] EXTERNAL VARIABLE "C::static_member_variable"<br>
+; CHECK-DAG: [[STATIC_MEM_FUNC]] EXTERNAL FUNCTION "C::static_member_function"<br>
+<br>
<br>
; CHECK-LABEL: debug_gnu_pubtypes contents:<br>
; CHECK-NEXT: Length:<br>
@@ -113,23 +127,26 @@<br>
; CHECK-NEXT: Size:<br>
; CHECK-NEXT: Offset Linkage Kind Name<br>
; CHECK-DAG: [[C]] EXTERNAL TYPE "C"<br>
+; CHECK-DAG: [[D]] EXTERNAL TYPE "ns::D"<br>
; CHECK-DAG: [[INT]] STATIC TYPE "int"<br>
<br>
%struct.C = type { i8 }<br>
+%"struct.ns::D" = type { i32 }<br>
<br>
@_ZN1C22static_member_variableE = global i32 0, align 4<br>
@global_variable = global %struct.C zeroinitializer, align 1<br>
@_ZN2ns25global_namespace_variableE = global i32 1, align 4<br>
+@_ZN2ns1dE = global %"struct.ns::D" zeroinitializer, align 4<br>
<br>
; Function Attrs: nounwind uwtable<br>
define void @_ZN1C15member_functionEv(%struct.C* %this) #0 align 2 {<br>
entry:<br>
%this.addr = alloca %struct.C*, align 8<br>
store %struct.C* %this, %struct.C** %this.addr, align 8<br>
- call void @llvm.dbg.declare(metadata !{%struct.C** %this.addr}, metadata !31), !dbg !33<br>
+ call void @llvm.dbg.declare(metadata !{%struct.C** %this.addr}, metadata !36), !dbg !38<br>
%this1 = load %struct.C** %this.addr<br>
- store i32 0, i32* @_ZN1C22static_member_variableE, align 4, !dbg !34<br>
- ret void, !dbg !34<br>
+ store i32 0, i32* @_ZN1C22static_member_variableE, align 4, !dbg !39<br>
+ ret void, !dbg !39<br>
}<br>
<br>
; Function Attrs: nounwind readnone<br>
@@ -138,64 +155,71 @@ declare void @llvm.dbg.declare(metadata,<br>
; Function Attrs: nounwind uwtable<br>
define i32 @_ZN1C22static_member_functionEv() #0 align 2 {<br>
entry:<br>
- %0 = load i32* @_ZN1C22static_member_variableE, align 4, !dbg !35<br>
- ret i32 %0, !dbg !35<br>
+ %0 = load i32* @_ZN1C22static_member_variableE, align 4, !dbg !40<br>
+ ret i32 %0, !dbg !40<br>
}<br>
<br>
; Function Attrs: nounwind uwtable<br>
define i32 @_Z15global_functionv() #0 {<br>
entry:<br>
- ret i32 -1, !dbg !36<br>
+ ret i32 -1, !dbg !41<br>
}<br>
<br>
; Function Attrs: nounwind uwtable<br>
define void @_ZN2ns25global_namespace_functionEv() #0 {<br>
entry:<br>
- call void @_ZN1C15member_functionEv(%struct.C* @global_variable), !dbg !37<br>
- ret void, !dbg !37<br>
+ call void @_ZN1C15member_functionEv(%struct.C* @global_variable), !dbg !42<br>
+ ret void, !dbg !42<br>
}<br>
<br>
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" }<br>
attributes #1 = { nounwind readnone }<br>
<br>
!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
-!llvm.module.flags = !{!30}<br>
+!llvm.module.flags = !{!34}<br>
+!llvm.ident = !{!35}<br>
<br>
-!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4 (trunk 191222) (llvm/trunk 191239)", i1 false, metadata !"", i32 0, metadata !2, metadata !3, metadata !17, metadata !26, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [/usr/local/google/home/echristo/tmp/pubnames.cpp] [DW_LANG_C_plus_plus]<br>
+!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4 (trunk 192862) (llvm/trunk 192861)", i1 false, metadata !"", i32 0, metadata !2, metadata !3, metadata !21, metadata !29, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [/usr/local/google/home/echristo/tmp/pubnames.cpp] [DW_LANG_C_plus_plus]<br>
!1 = metadata !{metadata !"pubnames.cpp", metadata !"/usr/local/google/home/echristo/tmp"}<br>
!2 = metadata !{i32 0}<br>
-!3 = metadata !{metadata !4}<br>
+!3 = metadata !{metadata !4, metadata !17}<br>
!4 = metadata !{i32 786451, metadata !1, null, metadata !"C", i32 1, i64 8, i64 8, i32 0, i32 0, null, metadata !5, i32 0, null, null, metadata !"_ZTS1C"} ; [ DW_TAG_structure_type ] [C] [line 1, size 8, align 8, offset 0] [def] [from ]<br>
!5 = metadata !{metadata !6, metadata !8, metadata !13}<br>
-!6 = metadata !{i32 786445, metadata !1, metadata !4, metadata !"static_member_variable", i32 4, i64 0, i64 0, i64 0, i32 4096, metadata !7, null} ; [ DW_TAG_member ] [static_member_variable] [line 4, size 0, align 0, offset 0] [static] [from int]<br>
+!6 = metadata !{i32 786445, metadata !1, metadata !"_ZTS1C", metadata !"static_member_variable", i32 4, i64 0, i64 0, i64 0, i32 4096, metadata !7, null} ; [ DW_TAG_member ] [static_member_variable] [line 4, size 0, align 0, offset 0] [static] [from int]<br>
!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]<br>
-!8 = metadata !{i32 786478, metadata !1, metadata !4, metadata !"member_function", metadata !"member_function", metadata !"_ZN1C15member_functionEv", i32 2, metadata !9, i1 false, i1 false, i32 0, i32 0, null, i32 256, i1 false, null, null, i32 0, metadata !12, i32 2} ; [ DW_TAG_subprogram ] [line 2] [member_function]<br>
+!8 = metadata !{i32 786478, metadata !1, metadata !"_ZTS1C", metadata !"member_function", metadata !"member_function", metadata !"_ZN1C15member_functionEv", i32 2, metadata !9, i1 false, i1 false, i32 0, i32 0, null, i32 256, i1 false, null, null, i32 0, metadata !12, i32 2} ; [ DW_TAG_subprogram ] [line 2] [member_function]<br>
!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 ]<br>
!10 = metadata !{null, metadata !11}<br>
-!11 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 1088, metadata !4} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [artificial] [from C]<br>
+!11 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 1088, metadata !"_ZTS1C"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [artificial] [from _ZTS1C]<br>
!12 = metadata !{i32 786468}<br>
-!13 = metadata !{i32 786478, metadata !1, metadata !4, metadata !"static_member_function", metadata !"static_member_function", metadata !"_ZN1C22static_member_functionEv", i32 3, metadata !14, i1 false, i1 false, i32 0, i32 0, null, i32 256, i1 false, null, null, i32 0, metadata !16, i32 3} ; [ DW_TAG_subprogram ] [line 3] [static_member_function]<br>
+!13 = metadata !{i32 786478, metadata !1, metadata !"_ZTS1C", metadata !"static_member_function", metadata !"static_member_function", metadata !"_ZN1C22static_member_functionEv", i32 3, metadata !14, i1 false, i1 false, i32 0, i32 0, null, i32 256, i1 false, null, null, i32 0, metadata !16, i32 3} ; [ DW_TAG_subprogram ] [line 3] [static_member_function]<br>
!14 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !15, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
!15 = metadata !{metadata !7}<br>
!16 = metadata !{i32 786468}<br>
-!17 = metadata !{metadata !18, metadata !19, metadata !20, metadata !22}<br>
-!18 = metadata !{i32 786478, metadata !1, null, metadata !"member_function", metadata !"member_function", metadata !"_ZN1C15member_functionEv", i32 9, metadata !9, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void (%struct.C*)* @_ZN1C15member_functionEv, null, metadata !8, metadata !2, i32 9} ; [ DW_TAG_subprogram ] [line 9] [def] [member_function]<br>
-!19 = metadata !{i32 786478, metadata !1, null, metadata !"static_member_function", metadata !"static_member_function", metadata !"_ZN1C22static_member_functionEv", i32 11, metadata !14, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 ()* @_ZN1C22static_member_functionEv, null, metadata !13, metadata !2, i32 11} ; [ DW_TAG_subprogram ] [line 11] [def] [static_member_function]<br>
-!20 = metadata !{i32 786478, metadata !1, metadata !21, metadata !"global_function", metadata !"global_function", metadata !"_Z15global_functionv", i32 15, metadata !14, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 ()* @_Z15global_functionv, null, null, metadata !2, i32 15} ; [ DW_TAG_subprogram ] [line 15] [def] [global_function]<br>
-!21 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [/usr/local/google/home/echristo/tmp/pubnames.cpp]<br>
-!22 = metadata !{i32 786478, metadata !1, metadata !23, metadata !"global_namespace_function", metadata !"global_namespace_function", metadata !"_ZN2ns25global_namespace_functionEv", i32 18, metadata !24, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void ()* @_ZN2ns25global_namespace_functionEv, null, null, metadata !2, i32 18} ; [ DW_TAG_subprogram ] [line 18] [def] [global_namespace_function]<br>
-!23 = metadata !{i32 786489, metadata !1, null, metadata !"ns", i32 17} ; [ DW_TAG_namespace ] [ns] [line 17]<br>
-!24 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !25, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
-!25 = metadata !{null}<br>
-!26 = metadata !{metadata !27, metadata !28, metadata !29}<br>
-!27 = metadata !{i32 786484, i32 0, metadata !4, metadata !"static_member_variable", metadata !"static_member_variable", metadata !"_ZN1C22static_member_variableE", metadata !21, i32 7, metadata !7, i32 0, i32 1, i32* @_ZN1C22static_member_variableE, metadata !6} ; [ DW_TAG_variable ] [static_member_variable] [line 7] [def]<br>
-!28 = metadata !{i32 786484, i32 0, null, metadata !"global_variable", metadata !"global_variable", metadata !"", metadata !21, i32 13, metadata !4, i32 0, i32 1, %struct.C* @global_variable, null} ; [ DW_TAG_variable ] [global_variable] [line 13] [def]<br>
-!29 = metadata !{i32 786484, i32 0, metadata !23, metadata !"global_namespace_variable", metadata !"global_namespace_variable", metadata !"_ZN2ns25global_namespace_variableE", metadata !21, i32 19, metadata !7, i32 0, i32 1, i32* @_ZN2ns25global_namespace_variableE, null} ; [ DW_TAG_variable ] [global_namespace_variable] [line 19] [def]<br>
-!30 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}<br>
-!31 = metadata !{i32 786689, metadata !18, metadata !"this", null, i32 16777216, metadata !32, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
-!32 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !4} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from C]<br>
-!33 = metadata !{i32 0, i32 0, metadata !18, null}<br>
-!34 = metadata !{i32 9, i32 0, metadata !18, null}<br>
-!35 = metadata !{i32 11, i32 0, metadata !19, null}<br>
-!36 = metadata !{i32 15, i32 0, metadata !20, null}<br>
-!37 = metadata !{i32 18, i32 0, metadata !22, null}<br>
+!17 = metadata !{i32 786451, metadata !1, metadata !18, metadata !"D", i32 21, i64 32, i64 32, i32 0, i32 0, null, metadata !19, i32 0, null, null, metadata !"_ZTSN2ns1DE"} ; [ DW_TAG_structure_type ] [D] [line 21, size 32, align 32, offset 0] [def] [from ]<br>
+!18 = metadata !{i32 786489, metadata !1, null, metadata !"ns", i32 17} ; [ DW_TAG_namespace ] [ns] [line 17]<br>
+!19 = metadata !{metadata !20}<br>
+!20 = metadata !{i32 786445, metadata !1, metadata !"_ZTSN2ns1DE", metadata !"A", i32 22, i64 32, i64 32, i64 0, i32 0, metadata !7} ; [ DW_TAG_member ] [A] [line 22, size 32, align 32, offset 0] [from int]<br>
+!21 = metadata !{metadata !22, metadata !23, metadata !24, metadata !26}<br>
+!22 = metadata !{i32 786478, metadata !1, metadata !"_ZTS1C", metadata !"member_function", metadata !"member_function", metadata !"_ZN1C15member_functionEv", i32 9, metadata !9, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void (%struct.C*)* @_ZN1C15member_functionEv, null, metadata !8, metadata !2, i32 9} ; [ DW_TAG_subprogram ] [line 9] [def] [member_function]<br>
+!23 = metadata !{i32 786478, metadata !1, metadata !"_ZTS1C", metadata !"static_member_function", metadata !"static_member_function", metadata !"_ZN1C22static_member_functionEv", i32 11, metadata !14, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 ()* @_ZN1C22static_member_functionEv, null, metadata !13, metadata !2, i32 11} ; [ DW_TAG_subprogram ] [line 11] [def] [static_member_function]<br>
+!24 = metadata !{i32 786478, metadata !1, metadata !25, metadata !"global_function", metadata !"global_function", metadata !"_Z15global_functionv", i32 15, metadata !14, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 ()* @_Z15global_functionv, null, null, metadata !2, i32 15} ; [ DW_TAG_subprogram ] [line 15] [def] [global_function]<br>
+!25 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [/usr/local/google/home/echristo/tmp/pubnames.cpp]<br>
+!26 = metadata !{i32 786478, metadata !1, metadata !18, metadata !"global_namespace_function", metadata !"global_namespace_function", metadata !"_ZN2ns25global_namespace_functionEv", i32 18, metadata !27, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void ()* @_ZN2ns25global_namespace_functionEv, null, null, metadata !2, i32 18} ; [ DW_TAG_subprogram ] [line 18] [def] [global_namespace_function]<br>
+!27 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !28, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!28 = metadata !{null}<br>
+!29 = metadata !{metadata !30, metadata !31, metadata !32, metadata !33}<br>
+!30 = metadata !{i32 786484, i32 0, metadata !4, metadata !"static_member_variable", metadata !"static_member_variable", metadata !"_ZN1C22static_member_variableE", metadata !25, i32 7, metadata !7, i32 0, i32 1, i32* @_ZN1C22static_member_variableE, metadata !6} ; [ DW_TAG_variable ] [static_member_variable] [line 7] [def]<br>
+!31 = metadata !{i32 786484, i32 0, null, metadata !"global_variable", metadata !"global_variable", metadata !"", metadata !25, i32 13, metadata !4, i32 0, i32 1, %struct.C* @global_variable, null} ; [ DW_TAG_variable ] [global_variable] [line 13] [def]<br>
+!32 = metadata !{i32 786484, i32 0, metadata !18, metadata !"global_namespace_variable", metadata !"global_namespace_variable", metadata !"_ZN2ns25global_namespace_variableE", metadata !25, i32 19, metadata !7, i32 0, i32 1, i32* @_ZN2ns25global_namespace_variableE, null} ; [ DW_TAG_variable ] [global_namespace_variable] [line 19] [def]<br>
+!33 = metadata !{i32 786484, i32 0, metadata !18, metadata !"d", metadata !"d", metadata !"_ZN2ns1dE", metadata !25, i32 23, metadata !17, i32 0, i32 1, %"struct.ns::D"* @_ZN2ns1dE, null} ; [ DW_TAG_variable ] [d] [line 23] [def]<br>
+!34 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}<br>
+!35 = metadata !{metadata !"clang version 3.4 (trunk 192862) (llvm/trunk 192861)"}<br>
+!36 = metadata !{i32 786689, metadata !22, metadata !"this", null, i32 16777216, metadata !37, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
+!37 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !"_ZTS1C"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1C]<br>
+!38 = metadata !{i32 0, i32 0, metadata !22, null}<br>
+!39 = metadata !{i32 9, i32 0, metadata !22, null}<br>
+!40 = metadata !{i32 11, i32 0, metadata !23, null}<br>
+!41 = metadata !{i32 15, i32 0, metadata !24, null}<br>
+!42 = metadata !{i32 18, i32 0, metadata !26, null}<br>
+<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></div>