<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Oct 29, 2013 at 12:05 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"><div dir="ltr"><br><div>Eric mentioned the same thing, getOrCreateContextDIE is also used in DwarfDebug where we check if the return value is null</div>
<div><div>void DwarfDebug::constructImportedEntityDIE(CompileUnit *TheCU,</div>
<div> const MDNode *N) {</div><div> DIImportedEntity Module(N);</div><div> if (!Module.Verify())</div><div> return;</div><div> if (DIE *D = TheCU->getOrCreateContextDIE(Module.getContext()))</div>
<div> constructImportedEntityDIE(TheCU, Module, D);</div><div>}</div></div><div><br></div><div>So most of the times, we can return the CU, except the above case </div></div></blockquote><div><br></div><div>It's possible that this is just a bug or a condition that never actually fires. Looking at a simple example of a top-level scoped imported_module:<br>
<br>namespace x {<br> int i;<br>}<br><br>using namespace x;<br><br>int main() {</div><div> i = 3;<br>}<br><br>the IR produced has an imported_module that has a parent context of the compile_unit. This seems to work fine - we don't silently ignore the imported_module just because it's at the top level.<br>
<br>Seems like we could remove that conditional and the functionality that powers it, allowing the cleanup suggested.</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">
<div dir="ltr"><div>(I am not an expert on imported entity :). </div></div></blockquote><div><br></div><div>Sure enough - but a little experimentation/examination can be helpful so we don't preserve behavior/complexity that isn't needed.<br>
<br>- David</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"><div dir="ltr"><div><br>
</div><div>Thanks,</div><div>Manman</div></div><div class=""><div class="h5"><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Oct 29, 2013 at 10:49 AM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@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"><div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">
<div><div>On Mon, Oct 28, 2013 at 10:49 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: Tue Oct 29 00:49:41 2013<br>
New Revision: 193589<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=193589&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=193589&view=rev</a><br>
Log:<br>
Debug Info: instead of calling addToContextOwner which constructs the context<br>
after the DIE creation, we construct the context first.<br>
<br>
This touches creation of namespaces and global variables. The purpose is to<br>
handle all DIE creations similarly: constructs the context first, then creates<br>
the DIE and immediately adds the DIE to its parent.<br>
<br>
We use createAndAddDIE to wrap around "new DIE(".<br>
<br>
Modified:<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>
llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll<br>
llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll<br>
llvm/trunk/test/DebugInfo/X86/DW_TAG_friend.ll<br>
llvm/trunk/test/DebugInfo/X86/empty-array.ll<br>
llvm/trunk/test/DebugInfo/X86/enum-class.ll<br>
llvm/trunk/test/DebugInfo/X86/fission-cu.ll<br>
llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll<br>
llvm/trunk/test/DebugInfo/X86/nondefault-subrange-array.ll<br>
llvm/trunk/test/DebugInfo/X86/objc-fwd-decl.ll<br>
llvm/trunk/test/DebugInfo/X86/stringpool.ll<br>
llvm/trunk/test/DebugInfo/X86/struct-loc.ll<br>
llvm/trunk/test/DebugInfo/template-recursive-void.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=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Tue Oct 29 00:49:41 2013<br>
@@ -1327,11 +1327,19 @@ CompileUnit::constructTemplateValueParam<br>
<br>
/// getOrCreateNameSpace - Create a DIE for DINameSpace.<br>
DIE *CompileUnit::getOrCreateNameSpace(DINameSpace NS) {<br>
+ // Construct the context before querying for the existence of the DIE in case<br>
+ // such construction creates the DIE.<br>
+ DIE *ContextDIE = getOrCreateContextDIE(NS.getContext());<br>
+ if (!ContextDIE)<br>
+ // If the context is null, DIE should belong to the CU we call construct<br>
+ // function on.<br>
+ ContextDIE = CUDie.get();<br></blockquote><div><br></div></div></div><div>Should we just build in the "fall back to CU" behavior in "getOrCreateContextDIE" instead of having each caller deal with this? (in the same way that addtoContextOwner probably handles this case already for all users)</div>
<div><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">
+<br>
DIE *NDie = getDIE(NS);<br>
if (NDie)<br>
return NDie;<br>
- NDie = new DIE(dwarf::DW_TAG_namespace);<br>
- insertDIE(NS, NDie);<br>
+ NDie = createAndAddDIE(dwarf::DW_TAG_namespace, *ContextDIE, NS);<br>
+<br>
if (!NS.getName().empty()) {<br>
addString(NDie, dwarf::DW_AT_name, NS.getName());<br>
addAccelNamespace(NS.getName(), NDie);<br>
@@ -1339,7 +1347,6 @@ DIE *CompileUnit::getOrCreateNameSpace(D<br>
} else<br>
addAccelNamespace("(anonymous namespace)", NDie);<br>
addSourceLine(NDie, NS);<br>
- addToContextOwner(NDie, NS.getContext());<br>
return NDie;<br>
}<br>
<br>
@@ -1506,9 +1513,14 @@ void CompileUnit::createGlobalVariableDI<br>
// If this is not a static data member definition, create the variable<br>
// DIE and add the initial set of attributes to it.<br>
if (!VariableDIE) {<br>
- VariableDIE = new DIE(GV.getTag());<br>
+ // Construct the context before querying for the existence of the DIE in<br>
+ // case such construction creates the DIE.<br>
+ DIE *ContextDIE = getOrCreateContextDIE(GVContext);<br>
+ if (!ContextDIE)<br>
+ ContextDIE = CUDie.get();<br>
+<br>
// Add to map.<br>
- insertDIE(N, VariableDIE);<br>
+ VariableDIE = createAndAddDIE(GV.getTag(), *ContextDIE, N);<br>
<br>
// Add name and type.<br>
addString(VariableDIE, dwarf::DW_AT_name, GV.getDisplayName());<br>
@@ -1520,8 +1532,6 @@ void CompileUnit::createGlobalVariableDI<br>
<br>
// Add line number info.<br>
addSourceLine(VariableDIE, GV);<br>
- // Add to context owner.<br>
- addToContextOwner(VariableDIE, GVContext);<br>
}<br>
<br>
// Add location.<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll?rev=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/2010-08-10-DbgConstant.ll Tue Oct 29 00:49:41 2013<br>
@@ -1,7 +1,7 @@<br>
; RUN: llc -mtriple=i686-linux -O0 -filetype=obj -o %t %s<br>
; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s<br>
-; CHECK: DW_TAG_constant [4]<br>
-; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000002c] = "ro")<br>
+; CHECK: DW_TAG_constant<br>
+; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]*}}] = "ro")<br>
<br>
define void @foo() nounwind ssp {<br>
entry:<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll?rev=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll Tue Oct 29 00:49:41 2013<br>
@@ -37,13 +37,13 @@ declare void @llvm.dbg.declare(metadata,<br>
!19 = metadata !{i32 5, i32 5, metadata !16, null}<br>
!20 = metadata !{metadata !"test.c", metadata !"/work/llvm/vanilla/test/DebugInfo"}<br>
<br>
-; CHECK: DW_TAG_variable [3]<br>
-; CHECK: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000043] = "GLB")<br>
+; CHECK: DW_TAG_variable<br>
+; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]*}}] = "GLB")<br>
; CHECK: DW_AT_decl_file [DW_FORM_data1] (0x01)<br>
; CHECK: DW_AT_decl_line [DW_FORM_data1] (0x01)<br>
<br>
-; CHECK: DW_TAG_variable [6]<br>
-; CHECK: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000004d] = "LOC")<br>
+; CHECK: DW_TAG_variable<br>
+; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]*}}] = "LOC")<br>
; CHECK: DW_AT_decl_file [DW_FORM_data1] (0x01)<br>
; CHECK: DW_AT_decl_line [DW_FORM_data1] (0x04)<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/DW_TAG_friend.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_TAG_friend.ll?rev=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/DW_TAG_friend.ll?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/DW_TAG_friend.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/DW_TAG_friend.ll Tue Oct 29 00:49:41 2013<br>
@@ -3,10 +3,10 @@<br>
<br>
; Check that the friend tag is there and is followed by a DW_AT_friend that has a reference back.<br>
<br>
-; CHECK: [[BACK:0x[0-9a-f]*]]: DW_TAG_class_type [4]<br>
+; CHECK: [[BACK:0x[0-9a-f]*]]: DW_TAG_class_type<br>
; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[{{.*}}] = "A")<br>
-; CHECK: DW_TAG_friend [9]<br>
-; CHECK-NEXT: DW_AT_friend [DW_FORM_ref4] (cu + 0x0032 => {[[BACK]]})<br>
+; CHECK: DW_TAG_friend<br>
+; CHECK-NEXT: DW_AT_friend [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BACK]]})<br>
<br>
<br>
%class.A = type { i32 }<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/empty-array.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/empty-array.ll?rev=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/empty-array.ll?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/empty-array.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/empty-array.ll Tue Oct 29 00:49:41 2013<br>
@@ -6,21 +6,22 @@<br>
<br>
@a = global %class.A zeroinitializer, align 4<br>
<br>
-; CHECK: 0x0000002d: DW_TAG_base_type [3]<br>
+; CHECK: [[BASETYPE:0x[0-9a-f]*]]: DW_TAG_base_type<br>
+; CHECK: [[BASE2:0x[0-9a-f]*]]: DW_TAG_base_type<br>
; CHECK-NEXT: DW_AT_name<br>
; CHECK-NEXT: DW_AT_byte_size [DW_FORM_data1] (0x04)<br>
; CHECK-NEXT: DW_AT_encoding [DW_FORM_data1] (0x05)<br>
<br>
-; CHECK: 0x00000034: DW_TAG_array_type [4] *<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0026 => {0x00000026})<br>
+; CHECK: [[ARRAY:0x[0-9a-f]*]]: DW_TAG_array_type [{{.*}}] *<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASETYPE]]})<br>
<br>
-; CHECK: 0x00000039: DW_TAG_subrange_type [5]<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x002d => {0x0000002d})<br>
+; CHECK: DW_TAG_subrange_type<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASE2]]})<br>
; CHECK-NOT: DW_AT_upper_bound<br>
<br>
-; CHECK: DW_TAG_member [8]<br>
-; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000003f] = "x")<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0034 => {0x00000034})<br>
+; CHECK: DW_TAG_member<br>
+; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]*}}] = "x")<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[ARRAY]]})<br>
<br>
!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/enum-class.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/enum-class.ll?rev=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/enum-class.ll?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/enum-class.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/enum-class.ll Tue Oct 29 00:49:41 2013<br>
@@ -28,12 +28,12 @@<br>
!21 = metadata !{i32 786484, i32 0, null, metadata !"c", metadata !"c", metadata !"", metadata !4, i32 6, metadata !12, i32 0, i32 1, i32* @c, null} ; [ DW_TAG_variable ]<br>
!22 = metadata !{metadata !"foo.cpp", metadata !"/Users/echristo/tmp"}<br>
<br>
-; CHECK: DW_TAG_enumeration_type [3]<br>
+; CHECK: DW_TAG_enumeration_type [{{.*}}]<br>
; CHECK: DW_AT_type [DW_FORM_ref4]<br>
; CHECK: DW_AT_enum_class [DW_FORM_flag_present] (true)<br>
; CHECK: DW_AT_name [DW_FORM_strp] ( .debug_str[{{.*}}] = "A")<br>
<br>
-; CHECK: DW_TAG_enumeration_type [3] *<br>
+; CHECK: DW_TAG_enumeration_type [{{.*}}] *<br>
; CHECK: DW_AT_type [DW_FORM_ref4]<br>
; CHECK: DW_AT_enum_class [DW_FORM_flag_present] (true)<br>
; CHECK: DW_AT_name [DW_FORM_strp] ( .debug_str[{{.*}}] = "B")<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/fission-cu.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/fission-cu.ll?rev=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/fission-cu.ll?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/fission-cu.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/fission-cu.ll Tue Oct 29 00:49:41 2013<br>
@@ -54,12 +54,7 @@<br>
; CHECK-NOT: DW_AT_comp_dir<br>
; CHECK: DW_AT_GNU_dwo_id DW_FORM_data8<br>
<br>
-; CHECK: [2] DW_TAG_base_type DW_CHILDREN_no<br>
-; CHECK: DW_AT_name DW_FORM_GNU_str_index<br>
-; CHECK: DW_AT_encoding DW_FORM_data1<br>
-; CHECK: DW_AT_byte_size DW_FORM_data1<br>
-<br>
-; CHECK: [3] DW_TAG_variable DW_CHILDREN_no<br>
+; CHECK: [2] DW_TAG_variable DW_CHILDREN_no<br>
; CHECK: DW_AT_name DW_FORM_GNU_str_index<br>
; CHECK: DW_AT_type DW_FORM_ref4<br>
; CHECK: DW_AT_external DW_FORM_flag_present<br>
@@ -67,6 +62,11 @@<br>
; CHECK: DW_AT_decl_line DW_FORM_data1<br>
; CHECK: DW_AT_location DW_FORM_block1<br>
<br>
+; CHECK: [3] DW_TAG_base_type DW_CHILDREN_no<br>
+; CHECK: DW_AT_name DW_FORM_GNU_str_index<br>
+; CHECK: DW_AT_encoding DW_FORM_data1<br>
+; CHECK: DW_AT_byte_size DW_FORM_data1<br>
+<br>
; Check that the rest of the compile units have information.<br>
; CHECK: .debug_info.dwo contents:<br>
; CHECK: DW_TAG_compile_unit<br>
@@ -77,15 +77,15 @@<br>
; CHECK-NOT: DW_AT_stmt_list<br>
; CHECK-NOT: DW_AT_comp_dir<br>
; CHECK: DW_AT_GNU_dwo_id [DW_FORM_data8] (0x0000000000000000)<br>
-; CHECK: DW_TAG_base_type<br>
-; CHECK: DW_AT_name [DW_FORM_GNU_str_index] ( indexed (00000003) string = "int")<br>
; CHECK: DW_TAG_variable<br>
; CHECK: DW_AT_name [DW_FORM_GNU_str_index] ( indexed (00000002) string = "a")<br>
-; CHECK: DW_AT_type [DW_FORM_ref4] (cu + 0x0018 => {0x00000018})<br>
+; CHECK: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[TYPE:0x[0-9a-f]*]]})<br>
; CHECK: DW_AT_external [DW_FORM_flag_present] (true)<br>
; CHECK: DW_AT_decl_file [DW_FORM_data1] (0x01)<br>
; CHECK: DW_AT_decl_line [DW_FORM_data1] (0x01)<br>
; CHECK: DW_AT_location [DW_FORM_block1] (<0x02> fb 00 )<br>
+; CHECK: [[TYPE]]: DW_TAG_base_type<br>
+; CHECK: DW_AT_name [DW_FORM_GNU_str_index] ( indexed (00000003) string = "int")<br>
<br>
<br>
; CHECK: .debug_str.dwo contents:<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=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/gnu-public-names.ll?rev=193589&r1=193588&r2=193589&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 Tue Oct 29 00:49:41 2013<br>
@@ -77,12 +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: [[D:[0-9a-f]+]]: DW_TAG_structure_type<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>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/nondefault-subrange-array.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/nondefault-subrange-array.ll?rev=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/nondefault-subrange-array.ll?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/nondefault-subrange-array.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/nondefault-subrange-array.ll Tue Oct 29 00:49:41 2013<br>
@@ -8,22 +8,23 @@<br>
; Check that we can handle non-default array bounds. In this case, the array<br>
; goes from [-3, 38].<br>
<br>
-; CHECK: 0x0000002d: DW_TAG_base_type [3]<br>
-; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000041] = "int")<br>
+; CHECK: [[BASE:0x[0-9a-f]*]]: DW_TAG_base_type<br>
+; CHECK: [[BASE2:0x[0-9a-f]*]]: DW_TAG_base_type<br>
+; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]*}}] = "int")<br>
; CHECK-NEXT: DW_AT_byte_size [DW_FORM_data1] (0x04)<br>
; CHECK-NEXT: DW_AT_encoding [DW_FORM_data1] (0x05)<br>
<br>
-; CHECK: 0x00000034: DW_TAG_array_type [4] *<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0026 => {0x00000026})<br>
+; CHECK: [[ARRAY:0x[0-9a-f]*]]: DW_TAG_array_type [{{.*}}] *<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASE]]})<br>
<br>
-; CHECK: 0x00000039: DW_TAG_subrange_type [5]<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x002d => {0x0000002d})<br>
+; CHECK: DW_TAG_subrange_type<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASE2]]})<br>
; CHECK-NEXT: DW_AT_lower_bound [DW_FORM_data8] (0xfffffffffffffffd)<br>
; CHECK-NEXT: DW_AT_upper_bound [DW_FORM_data1] (0x26)<br>
<br>
-; CHECK: 0x00000055: DW_TAG_member [8]<br>
-; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000003f] = "x")<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0034 => {0x00000034})<br>
+; CHECK: DW_TAG_member<br>
+; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-f]*}}] = "x")<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[ARRAY]]})<br>
<br>
!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/objc-fwd-decl.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/objc-fwd-decl.ll?rev=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/objc-fwd-decl.ll?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/objc-fwd-decl.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/objc-fwd-decl.ll Tue Oct 29 00:49:41 2013<br>
@@ -1,7 +1,7 @@<br>
; RUN: llc -mtriple=x86_64-macosx %s -o %t -filetype=obj<br>
; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s<br>
<br>
-; CHECK: 0x00000027: DW_TAG_structure_type<br>
+; CHECK: DW_TAG_structure_type<br>
; CHECK: DW_AT_declaration<br>
; CHECK: DW_AT_APPLE_runtime_class<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/stringpool.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/stringpool.ll?rev=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/stringpool.ll?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/stringpool.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/stringpool.ll Tue Oct 29 00:49:41 2013<br>
@@ -21,7 +21,7 @@<br>
<br>
; Verify that we refer to 'yyyy' with a relocation.<br>
; LINUX: .long .Linfo_string3 # DW_AT_name<br>
-; LINUX-NEXT: .long 38 # DW_AT_type<br>
+; LINUX-NEXT: .long {{[0-9]+}} # DW_AT_type<br>
; LINUX-NEXT: # DW_AT_external<br>
; LINUX-NEXT: .byte 1 # DW_AT_decl_file<br>
; LINUX-NEXT: .byte 1 # DW_AT_decl_line<br>
@@ -30,9 +30,9 @@<br>
; LINUX-NEXT: .quad yyyy<br>
<br>
; Verify that we refer to 'yyyy' without a relocation.<br>
-; DARWIN: Lset5 = Linfo_string3-Linfo_string ## DW_AT_name<br>
-; DARWIN-NEXT: .long Lset5<br>
-; DARWIN-NEXT: .long 38 ## DW_AT_type<br>
+; DARWIN: Lset[[ID:[0-9]+]] = Linfo_string3-Linfo_string ## DW_AT_name<br>
+; DARWIN-NEXT: .long Lset[[ID]]<br>
+; DARWIN-NEXT: .long {{[0-9]+}} ## DW_AT_type<br>
; DARWIN-NEXT: ## DW_AT_external<br>
; DARWIN-NEXT: .byte 1 ## DW_AT_decl_file<br>
; DARWIN-NEXT: .byte 1 ## DW_AT_decl_line<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/struct-loc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/struct-loc.ll?rev=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/struct-loc.ll?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/struct-loc.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/struct-loc.ll Tue Oct 29 00:49:41 2013<br>
@@ -2,7 +2,7 @@<br>
; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s<br>
<br>
; Make sure that structures have a decl file and decl line attached.<br>
-; CHECK: DW_TAG_structure_type [3]<br>
+; CHECK: DW_TAG_structure_type<br>
; CHECK: DW_AT_decl_file<br>
; CHECK: DW_AT_decl_line<br>
; CHECK: DW_TAG_member<br>
<br>
Modified: llvm/trunk/test/DebugInfo/template-recursive-void.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/template-recursive-void.ll?rev=193589&r1=193588&r2=193589&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/template-recursive-void.ll?rev=193589&r1=193588&r2=193589&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/template-recursive-void.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/template-recursive-void.ll Tue Oct 29 00:49:41 2013<br>
@@ -13,7 +13,7 @@<br>
; class bar : public foo<void> { };<br>
; bar filters;<br>
<br>
-; CHECK: DW_TAG_template_type_parameter [10]<br>
+; CHECK: DW_TAG_template_type_parameter [{{.*}}]<br>
; CHECK-NEXT: DW_AT_name{{.*}}"T"<br>
; CHECK-NOT: DW_AT_type<br>
; CHECK: 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></div></div><br></div></div>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div></div>