<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Nov 17, 2014 at 4:29 PM, Manman Ren <span dir="ltr"><<a href="mailto:manman.ren@gmail.com" target="_blank">manman.ren@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: mren<br>
Date: Mon Nov 17 18:29:08 2014<br>
New Revision: 222195<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=222195&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=222195&view=rev</a><br>
Log:<br>
Debug Info: In DIBuilder, the context field of a global variable is updated to<br>
use DIScopeRef.<br>
<br>
A paired commit at clang will follow to show cases where we will use an<br>
identifer for the context of a global variable.<br>
<br>
rdar://18958417<br>
<br>
Added:<br>
llvm/trunk/test/DebugInfo/global-with-type-context.ll<br>
Modified:<br>
llvm/trunk/include/llvm/IR/DebugInfo.h<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>
llvm/trunk/lib/IR/DIBuilder.cpp<br>
llvm/trunk/lib/IR/DebugInfo.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/IR/DebugInfo.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfo.h?rev=222195&r1=222194&r2=222195&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfo.h?rev=222195&r1=222194&r2=222195&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/IR/DebugInfo.h (original)<br>
+++ llvm/trunk/include/llvm/IR/DebugInfo.h Mon Nov 17 18:29:08 2014<br>
@@ -763,7 +763,7 @@ public:<br>
unsigned isLocalToUnit() const { return getHeaderFieldAs<bool>(5); }<br>
unsigned isDefinition() const { return getHeaderFieldAs<bool>(6); }<br>
<br>
- DIScope getContext() const { return getFieldAs<DIScope>(1); }<br>
+ DIScopeRef getContext() const { return getFieldAs<DIScopeRef>(1); }<br>
StringRef getFilename() const { return getFieldAs<DIFile>(2).getFilename(); }<br>
StringRef getDirectory() const {<br>
return getFieldAs<DIFile>(2).getDirectory();<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=222195&r1=222194&r2=222195&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=222195&r1=222194&r2=222195&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Mon Nov 17 18:29:08 2014<br>
@@ -103,7 +103,7 @@ DIE *DwarfCompileUnit::getOrCreateGlobal<br>
<br>
assert(GV.isGlobalVariable());<br>
<br>
- DIScope GVContext = GV.getContext();<br>
+ DIScope GVContext = DD->resolve(GV.getContext());<br>
DIType GTy = DD->resolve(GV.getType());<br>
<br>
// Construct the context before querying for the existence of the DIE in<br>
@@ -122,7 +122,7 @@ DIE *DwarfCompileUnit::getOrCreateGlobal<br>
DIE *VariableSpecDIE = getOrCreateStaticMemberDIE(SDMDecl);<br>
addDIEEntry(*VariableDIE, dwarf::DW_AT_specification, *VariableSpecDIE);<br>
} else {<br>
- DeclContext = GV.getContext();<br>
+ DeclContext = resolve(GV.getContext());<br>
// Add name and type.<br>
addString(*VariableDIE, dwarf::DW_AT_name, GV.getDisplayName());<br>
addType(*VariableDIE, GTy);<br>
<br>
Modified: llvm/trunk/lib/IR/DIBuilder.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DIBuilder.cpp?rev=222195&r1=222194&r2=222195&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DIBuilder.cpp?rev=222195&r1=222194&r2=222195&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/DIBuilder.cpp (original)<br>
+++ llvm/trunk/lib/IR/DIBuilder.cpp Mon Nov 17 18:29:08 2014<br>
@@ -844,7 +844,7 @@ static DIGlobalVariable createGlobalVari<br>
.concat(isLocalToUnit)<br>
.concat(isDefinition)<br>
.get(VMContext),<br>
- getNonCompileUnitScope(Context), F, Ty, Val,<br>
+ DIScope(getNonCompileUnitScope(Context)).getRef(), F, Ty, Val,<br>
DIDescriptor(Decl)};<br>
<br>
return DIGlobalVariable(CreateFunc(Elts));<br>
<br>
Modified: llvm/trunk/lib/IR/DebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=222195&r1=222194&r2=222195&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=222195&r1=222194&r2=222195&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/DebugInfo.cpp (original)<br>
+++ llvm/trunk/lib/IR/DebugInfo.cpp Mon Nov 17 18:29:08 2014<br>
@@ -567,8 +567,8 @@ bool DIGlobalVariable::Verify() const {<br>
<br>
if (getDisplayName().empty())<br>
return false;<br>
- // Make sure context @ field 1 is an MDNode.<br>
- if (!fieldIsMDNode(DbgNode, 1))<br>
+ // Make sure context @ field 1 is a ScopeRef.<br>
+ if (!fieldIsScopeRef(DbgNode, 1))<br>
return false;<br>
// Make sure that type @ field 3 is a DITypeRef.<br>
if (!fieldIsTypeRef(DbgNode, 3))<br>
@@ -1005,7 +1005,7 @@ void DebugInfoFinder::processModule(cons<br>
for (unsigned i = 0, e = GVs.getNumElements(); i != e; ++i) {<br>
DIGlobalVariable DIG(GVs.getElement(i));<br>
if (addGlobalVariable(DIG)) {<br>
- processScope(DIG.getContext());<br>
+ processScope(DIG.getContext().resolve(TypeIdentifierMap));<br>
processType(DIG.getType().resolve(TypeIdentifierMap));<br>
}<br>
}<br>
<br>
Added: llvm/trunk/test/DebugInfo/global-with-type-context.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/global-with-type-context.ll?rev=222195&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/global-with-type-context.ll?rev=222195&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/global-with-type-context.ll (added)<br>
+++ llvm/trunk/test/DebugInfo/global-with-type-context.ll Mon Nov 17 18:29:08 2014<br>
@@ -0,0 +1,154 @@<br>
+; REQUIRES: object-emission<br>
+<br>
+; RUN: %llc_dwarf -filetype=obj -O0 < %s > %t<br>
+; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s<br>
+<br>
+; IR generated from clang -g with the following source:<br>
+; struct F {<br>
+; static const int i = 2;<br>
+; virtual ~F();<br>
+; };<br>
+;<br>
+; void f1() {<br>
+; int i = F::i;<br>
+; }<br>
+<br>
+; Make sure we correctly handle context of a global variable being a type identifier.<br>
+; CHECK: [[STRUCT:.*]]: DW_TAG_structure_type<br>
+; CHECK: DW_AT_name [DW_FORM_strp] {{.*}}= "F")<br>
+; CHECK: DW_TAG_variable<br></blockquote><div><br></div><div>This isn't a feature, it's a bug. <a href="http://llvm.org/bugs/show_bug.cgi?id=21511" target="_blank">http://llvm.org/bugs/show_bug.cgi?id=21511</a> one that I need to fix (probably in the next few days).<br><br>Once this bug is fixed, is your change needed?</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
+; CHECK-NEXT: DW_AT_specification {{.*}} "i"<br>
+; CHECK-NEXT: DW_AT_const_value [DW_FORM_sdata] (2)<br>
+<br>
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"<br>
+target triple = "x86_64-apple-darwin14.0.0"<br>
+<br>
+; Function Attrs: nounwind<br>
+define void @_Z2f1v() #0 {<br>
+entry:<br>
+ %i = alloca i32, align 4<br>
+ call void @llvm.dbg.declare(metadata !{i32* %i}, metadata !29, metadata !30), !dbg !31<br>
+ store i32 2, i32* %i, align 4, !dbg !31<br>
+ ret void, !dbg !32<br>
+}<br>
+<br>
+; Function Attrs: nounwind readnone<br>
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1<br>
+<br>
+attributes #0 = { nounwind "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-realign-stack" "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 = !{!26, !27}<br>
+!llvm.ident = !{!28}<br>
+<br>
+!0 = metadata !{metadata !"0x11\004\00clang version 3.6.0 (trunk 222175)\000\00\000\00\001", metadata !1, metadata !2, metadata !3, metadata !20, metadata !24, metadata !2} ; [ DW_TAG_compile_unit ] [<stdin>] [DW_LANG_C_plus_plus]<br>
+!1 = metadata !{metadata !"<stdin>", metadata !"."}<br>
+!2 = metadata !{}<br>
+!3 = metadata !{metadata !4}<br>
+!4 = metadata !{metadata !"0x13\00F\001\0064\0064\000\000\000", metadata !5, null, null, metadata !6, metadata !"_ZTS1F", null, metadata !"_ZTS1F"} ; [ DW_TAG_structure_type ] [F] [line 1, size 64, align 64, offset 0] [def] [from ]<br>
+!5 = metadata !{metadata !"test.cpp", metadata !"."}<br>
+!6 = metadata !{metadata !7, metadata !14, metadata !16}<br>
+!7 = metadata !{metadata !"0xd\00_vptr$F\000\0064\000\000\0064", metadata !5, metadata !8, metadata !9} ; [ DW_TAG_member ] [_vptr$F] [line 0, size 64, align 0, offset 0] [artificial] [from ]<br>
+!8 = metadata !{metadata !"0x29", metadata !5} ; [ DW_TAG_file_type ]<br>
+!9 = metadata !{metadata !"0xf\00\000\0064\000\000\000", null, null, metadata !10} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 0, offset 0] [from __vtbl_ptr_type]<br>
+!10 = metadata !{metadata !"0xf\00__vtbl_ptr_type\000\0064\000\000\000", null, null, metadata !11} ; [ DW_TAG_pointer_type ] [__vtbl_ptr_type] [line 0, size 64, align 0, offset 0] [from ]<br>
+!11 = metadata !{metadata !"0x15\00\000\000\000\000\000\000", null, null, null, metadata !12, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!12 = metadata !{metadata !13}<br>
+!13 = metadata !{metadata !"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
+!14 = metadata !{metadata !"0xd\00i\002\000\000\000\004096", metadata !5, metadata !"_ZTS1F", metadata !15, i32 2} ; [ DW_TAG_member ] [i] [line 2, size 0, align 0, offset 0] [static] [from ]<br>
+!15 = metadata !{metadata !"0x26\00\000\000\000\000\000", null, null, metadata !13} ; [ DW_TAG_const_type ] [line 0, size 0, align 0, offset 0] [from int]<br>
+!16 = metadata !{metadata !"0x2e\00~F\00~F\00\003\000\000\001\000\00256\000\003", metadata !5, metadata !"_ZTS1F", metadata !17, metadata !"_ZTS1F", null, null, null, null} ; [ DW_TAG_subprogram ] [line 3] [~F]<br>
+!17 = metadata !{metadata !"0x15\00\000\000\000\000\000\000", null, null, null, metadata !18, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!18 = metadata !{null, metadata !19}<br>
+!19 = metadata !{metadata !"0xf\00\000\0064\0064\000\001088\00", null, null, metadata !"_ZTS1F"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [artificial] [from _ZTS1F]<br>
+!20 = metadata !{metadata !21}<br>
+!21 = metadata !{metadata !"0x2e\00f1\00f1\00_Z2f1v\006\000\001\000\000\00256\000\006", metadata !5, metadata !8, metadata !22, null, void ()* @_Z2f1v, null, null, metadata !2} ; [ DW_TAG_subprogram ] [line 6] [def] [f1]<br>
+!22 = metadata !{metadata !"0x15\00\000\000\000\000\000\000", null, null, null, metadata !23, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!23 = metadata !{null}<br>
+!24 = metadata !{metadata !25}<br>
+!25 = metadata !{metadata !"0x34\00i\00i\00\002\001\001", metadata !"_ZTS1F", metadata !8, metadata !15, i32 2, metadata !14} ; [ DW_TAG_variable ] [i] [line 2] [local] [def]<br>
+!26 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}<br>
+!27 = metadata !{i32 2, metadata !"Debug Info Version", i32 2}<br>
+!28 = metadata !{metadata !"clang version 3.6.0 (trunk 222175)"}<br>
+!29 = metadata !{metadata !"0x100\00i\007\000", metadata !21, metadata !8, metadata !13} ; [ DW_TAG_auto_variable ] [i] [line 7]<br>
+!30 = metadata !{metadata !"0x102"} ; [ DW_TAG_expression ]<br>
+!31 = metadata !{i32 7, i32 0, metadata !21, null}<br>
+!32 = metadata !{i32 8, i32 0, metadata !21, null}<br>
+; REQUIRES: object-emission<br>
+<br>
+; RUN: %llc_dwarf -filetype=obj -O0 < %s > %t<br>
+; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s<br>
+<br>
+; IR generated from clang -g with the following source:<br>
+; struct F {<br>
+; static const int i = 2;<br>
+; virtual ~F();<br>
+; };<br>
+;<br>
+; void f1() {<br>
+; int i = F::i;<br>
+; }<br>
+<br>
+; Make sure we correctly handle context of a global variable being a type identifier.<br>
+; CHECK: [[STRUCT:.*]]: DW_TAG_structure_type<br>
+; CHECK: DW_AT_name [DW_FORM_strp] {{.*}}= "F")<br>
+; CHECK: DW_TAG_variable<br>
+; CHECK-NEXT: DW_AT_specification {{.*}} "i"<br>
+; CHECK-NEXT: DW_AT_const_value [DW_FORM_sdata] (2)<br>
+<br>
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"<br>
+target triple = "x86_64-apple-darwin14.0.0"<br>
+<br>
+; Function Attrs: nounwind<br>
+define void @_Z2f1v() #0 {<br>
+entry:<br>
+ %i = alloca i32, align 4<br>
+ call void @llvm.dbg.declare(metadata !{i32* %i}, metadata !29, metadata !30), !dbg !31<br>
+ store i32 2, i32* %i, align 4, !dbg !31<br>
+ ret void, !dbg !32<br>
+}<br>
+<br>
+; Function Attrs: nounwind readnone<br>
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1<br>
+<br>
+attributes #0 = { nounwind "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-realign-stack" "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 = !{!26, !27}<br>
+!llvm.ident = !{!28}<br>
+<br>
+!0 = metadata !{metadata !"0x11\004\00clang version 3.6.0 (trunk 222175)\000\00\000\00\001", metadata !1, metadata !2, metadata !3, metadata !20, metadata !24, metadata !2} ; [ DW_TAG_compile_unit ] [<stdin>] [DW_LANG_C_plus_plus]<br>
+!1 = metadata !{metadata !"<stdin>", metadata !"."}<br>
+!2 = metadata !{}<br>
+!3 = metadata !{metadata !4}<br>
+!4 = metadata !{metadata !"0x13\00F\001\0064\0064\000\000\000", metadata !5, null, null, metadata !6, metadata !"_ZTS1F", null, metadata !"_ZTS1F"} ; [ DW_TAG_structure_type ] [F] [line 1, size 64, align 64, offset 0] [def] [from ]<br>
+!5 = metadata !{metadata !"test.cpp", metadata !"."}<br>
+!6 = metadata !{metadata !7, metadata !14, metadata !16}<br>
+!7 = metadata !{metadata !"0xd\00_vptr$F\000\0064\000\000\0064", metadata !5, metadata !8, metadata !9} ; [ DW_TAG_member ] [_vptr$F] [line 0, size 64, align 0, offset 0] [artificial] [from ]<br>
+!8 = metadata !{metadata !"0x29", metadata !5} ; [ DW_TAG_file_type ]<br>
+!9 = metadata !{metadata !"0xf\00\000\0064\000\000\000", null, null, metadata !10} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 0, offset 0] [from __vtbl_ptr_type]<br>
+!10 = metadata !{metadata !"0xf\00__vtbl_ptr_type\000\0064\000\000\000", null, null, metadata !11} ; [ DW_TAG_pointer_type ] [__vtbl_ptr_type] [line 0, size 64, align 0, offset 0] [from ]<br>
+!11 = metadata !{metadata !"0x15\00\000\000\000\000\000\000", null, null, null, metadata !12, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!12 = metadata !{metadata !13}<br>
+!13 = metadata !{metadata !"0x24\00int\000\0032\0032\000\000\005", null, null} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
+!14 = metadata !{metadata !"0xd\00i\002\000\000\000\004096", metadata !5, metadata !"_ZTS1F", metadata !15, i32 2} ; [ DW_TAG_member ] [i] [line 2, size 0, align 0, offset 0] [static] [from ]<br>
+!15 = metadata !{metadata !"0x26\00\000\000\000\000\000", null, null, metadata !13} ; [ DW_TAG_const_type ] [line 0, size 0, align 0, offset 0] [from int]<br>
+!16 = metadata !{metadata !"0x2e\00~F\00~F\00\003\000\000\001\000\00256\000\003", metadata !5, metadata !"_ZTS1F", metadata !17, metadata !"_ZTS1F", null, null, null, null} ; [ DW_TAG_subprogram ] [line 3] [~F]<br>
+!17 = metadata !{metadata !"0x15\00\000\000\000\000\000\000", null, null, null, metadata !18, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!18 = metadata !{null, metadata !19}<br>
+!19 = metadata !{metadata !"0xf\00\000\0064\0064\000\001088\00", null, null, metadata !"_ZTS1F"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [artificial] [from _ZTS1F]<br>
+!20 = metadata !{metadata !21}<br>
+!21 = metadata !{metadata !"0x2e\00f1\00f1\00_Z2f1v\006\000\001\000\000\00256\000\006", metadata !5, metadata !8, metadata !22, null, void ()* @_Z2f1v, null, null, metadata !2} ; [ DW_TAG_subprogram ] [line 6] [def] [f1]<br>
+!22 = metadata !{metadata !"0x15\00\000\000\000\000\000\000", null, null, null, metadata !23, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!23 = metadata !{null}<br>
+!24 = metadata !{metadata !25}<br>
+!25 = metadata !{metadata !"0x34\00i\00i\00\002\001\001", metadata !"_ZTS1F", metadata !8, metadata !15, i32 2, metadata !14} ; [ DW_TAG_variable ] [i] [line 2] [local] [def]<br>
+!26 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}<br>
+!27 = metadata !{i32 2, metadata !"Debug Info Version", i32 2}<br>
+!28 = metadata !{metadata !"clang version 3.6.0 (trunk 222175)"}<br>
+!29 = metadata !{metadata !"0x100\00i\007\000", metadata !21, metadata !8, metadata !13} ; [ DW_TAG_auto_variable ] [i] [line 7]<br>
+!30 = metadata !{metadata !"0x102"} ; [ DW_TAG_expression ]<br>
+!31 = metadata !{i32 7, i32 0, metadata !21, null}<br>
+!32 = metadata !{i32 8, i32 0, metadata !21, null}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">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>