<div dir="ltr">If you can, it's really handy to include info about why a patch is reverted (link/copy-paste of error messages from a buildbot, etc) so that future code archeology or someone else trying to contribute similar functionality, etc, can see why things happened. (also good to uinclude that info when a patch is recommitted, with info about how the issue was addressed - so it's easier to review the fix)<br><br>Thanks!<br>- Dave<div><br><div class="gmail_quote"><div dir="ltr">On Tue, Oct 10, 2017 at 4:49 AM Jonas Devlieghere via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: jdevlieghere<br>
Date: Tue Oct 10 04:49:56 2017<br>
New Revision: 315299<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=315299&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=315299&view=rev</a><br>
Log:<br>
Revert "[llvm-dwarfdump] Print type names in DW_AT_type DIEs"<br>
<br>
This reverts commit r315297.<br>
<br>
Modified:<br>
llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp<br>
llvm/trunk/test/DebugInfo/AMDGPU/pointer-address-space.ll<br>
llvm/trunk/test/DebugInfo/Generic/cross-cu-inlining.ll<br>
llvm/trunk/test/DebugInfo/Generic/enum-types.ll<br>
llvm/trunk/test/DebugInfo/Generic/member-pointers.ll<br>
llvm/trunk/test/DebugInfo/Generic/tu-composite.ll<br>
llvm/trunk/test/DebugInfo/Generic/tu-member-pointer.ll<br>
llvm/trunk/test/DebugInfo/X86/default-subrange-array.ll<br>
llvm/trunk/test/DebugInfo/X86/empty-array.ll<br>
llvm/trunk/test/DebugInfo/X86/fission-cu.ll<br>
llvm/trunk/test/DebugInfo/X86/nondefault-subrange-array.ll<br>
llvm/trunk/test/DebugInfo/X86/ref_addr_relocation.ll<br>
llvm/trunk/test/DebugInfo/X86/subrange-type.ll<br>
llvm/trunk/test/DebugInfo/dwarfdump-type-units.test<br>
llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll<br>
llvm/trunk/test/Linker/type-unique-simple-a.ll<br>
llvm/trunk/test/Linker/type-unique-type-array-a.ll<br>
llvm/trunk/test/tools/dsymutil/X86/basic-linking-x86.test<br>
llvm/trunk/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test<br>
llvm/trunk/test/tools/dsymutil/X86/basic-lto-linking-x86.test<br>
llvm/trunk/test/tools/dsymutil/X86/modules.m<br>
llvm/trunk/test/tools/dsymutil/X86/odr-member-functions.cpp<br>
<br>
Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp (original)<br>
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp Tue Oct 10 04:49:56 2017<br>
@@ -124,64 +124,6 @@ static void dumpLocation(raw_ostream &OS<br>
}<br>
}<br>
<br>
-/// Dump the name encoded in the type tag.<br>
-static void dumpTypeTagName(raw_ostream &OS, dwarf::Tag T) {<br>
- StringRef TagStr = TagString(T);<br>
- if (!TagStr.startswith("DW_TAG_") || !TagStr.endswith("_type"))<br>
- return;<br>
- OS << TagStr.substr(7, TagStr.size() - 12) << " ";<br>
-}<br>
-<br>
-/// Recursively dump the DIE type name when applicable.<br>
-static void dumpTypeName(raw_ostream &OS, const DWARFDie &Die) {<br>
- DWARFDie D = Die.getAttributeValueAsReferencedDie(DW_AT_type);<br>
-<br>
- if (!D.isValid())<br>
- return;<br>
-<br>
- if (const char *Name = D.getName(DINameKind::LinkageName)) {<br>
- OS << Name;<br>
- return;<br>
- }<br>
-<br>
- // FIXME: We should have pretty printers per language. Currently we print<br>
- // everything as if it was C++ and fall back to the TAG type name.<br>
- const dwarf::Tag T = D.getTag();<br>
- switch (T) {<br>
- case DW_TAG_array_type:<br>
- case DW_TAG_pointer_type:<br>
- case DW_TAG_ptr_to_member_type:<br>
- case DW_TAG_reference_type:<br>
- case DW_TAG_rvalue_reference_type:<br>
- break;<br>
- default:<br>
- dumpTypeTagName(OS, T);<br>
- }<br>
-<br>
- // Follow the DW_AT_type if possible.<br>
- dumpTypeName(OS, D);<br>
-<br>
- switch (T) {<br>
- case DW_TAG_array_type:<br>
- OS << "[]";<br>
- break;<br>
- case DW_TAG_pointer_type:<br>
- OS << '*';<br>
- break;<br>
- case DW_TAG_ptr_to_member_type:<br>
- OS << '*';<br>
- break;<br>
- case DW_TAG_reference_type:<br>
- OS << '&';<br>
- break;<br>
- case DW_TAG_rvalue_reference_type:<br>
- OS << "&&";<br>
- break;<br>
- default:<br>
- break;<br>
- }<br>
-}<br>
-<br>
static void dumpAttribute(raw_ostream &OS, const DWARFDie &Die,<br>
uint32_t *OffsetPtr, dwarf::Attribute Attr,<br>
dwarf::Form Form, unsigned Indent,<br>
@@ -246,10 +188,6 @@ static void dumpAttribute(raw_ostream &O<br>
if (const char *Name = Die.getAttributeValueAsReferencedDie(Attr).getName(<br>
DINameKind::LinkageName))<br>
OS << " \"" << Name << '\"';<br>
- } else if (Attr == DW_AT_type) {<br>
- OS << " \"";<br>
- dumpTypeName(OS, Die);<br>
- OS << '"';<br>
} else if (Attr == DW_AT_APPLE_property_attribute) {<br>
if (Optional<uint64_t> OptVal = formValue.getAsUnsignedConstant())<br>
dumpApplePropertyAttribute(OS, *OptVal);<br>
<br>
Modified: llvm/trunk/test/DebugInfo/AMDGPU/pointer-address-space.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AMDGPU/pointer-address-space.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/AMDGPU/pointer-address-space.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/AMDGPU/pointer-address-space.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/AMDGPU/pointer-address-space.ll Tue Oct 10 04:49:56 2017<br>
@@ -15,27 +15,27 @@<br>
; CHECK: DW_AT_name {{.*}}"FuncVar0"<br>
; CHECK-NEXT: DW_AT_decl_file<br>
; CHECK-NEXT: DW_AT_decl_line<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[a-f0-9]+}} => {0x[[NONE:[a-f0-9]+]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[a-f0-9]+}} => {0x[[NONE:[a-f0-9]+]]})<br>
<br>
; CHECK: DW_AT_name {{.*}}"FuncVar1"<br>
; CHECK-NEXT: DW_AT_decl_file<br>
; CHECK-NEXT: DW_AT_decl_line<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[a-f0-9]+}} => {0x[[NONE]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[a-f0-9]+}} => {0x[[NONE]]})<br>
<br>
; CHECK: DW_AT_name {{.*}}"FuncVar2"<br>
; CHECK-NEXT: DW_AT_decl_file<br>
; CHECK-NEXT: DW_AT_decl_line<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[a-f0-9]+}} => {0x[[LOCAL:[a-f0-9]+]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[a-f0-9]+}} => {0x[[LOCAL:[a-f0-9]+]]})<br>
<br>
; CHECK: DW_AT_name {{.*}}"FuncVar3"<br>
; CHECK-NEXT: DW_AT_decl_file<br>
; CHECK-NEXT: DW_AT_decl_line<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[a-f0-9]+}} => {0x[[PRIVATE:[a-f0-9]+]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[a-f0-9]+}} => {0x[[PRIVATE:[a-f0-9]+]]})<br>
<br>
; CHECK: DW_AT_name {{.*}}"FuncVar4"<br>
; CHECK-NEXT: DW_AT_decl_file<br>
; CHECK-NEXT: DW_AT_decl_line<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[a-f0-9]+}} => {0x[[NONE]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[a-f0-9]+}} => {0x[[NONE]]})<br>
<br>
; CHECK: 0x[[NONE]]: DW_TAG_pointer_type<br>
; CHECK-NEXT: DW_AT_type<br>
<br>
Modified: llvm/trunk/test/DebugInfo/Generic/cross-cu-inlining.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/cross-cu-inlining.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/cross-cu-inlining.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/Generic/cross-cu-inlining.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/Generic/cross-cu-inlining.ll Tue Oct 10 04:49:56 2017<br>
@@ -24,7 +24,7 @@<br>
; CHECK: DW_TAG_compile_unit<br>
; CHECK: DW_AT_name {{.*}} "a.cpp"<br>
; CHECK: DW_TAG_subprogram<br>
-; CHECK: DW_AT_type [DW_FORM_ref_addr] (0x00000000[[INT:[a-f0-9]+]]<br>
+; CHECK: DW_AT_type [DW_FORM_ref_addr] (0x00000000[[INT:.*]])<br>
; CHECK: 0x[[INLINED:[0-9a-f]*]]:{{.*}}DW_TAG_inlined_subroutine<br>
; CHECK: DW_AT_abstract_origin {{.*}}[[ABS_FUNC:........]] "_Z4funci"<br>
; CHECK: DW_TAG_formal_parameter<br>
<br>
Modified: llvm/trunk/test/DebugInfo/Generic/enum-types.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/enum-types.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/enum-types.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/Generic/enum-types.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/Generic/enum-types.ll Tue Oct 10 04:49:56 2017<br>
@@ -12,7 +12,7 @@<br>
; CHECK: DW_TAG_subprogram<br>
; CHECK: DW_AT_MIPS_linkage_name {{.*}} "_Z4topA2EA"<br>
; CHECK: DW_TAG_formal_parameter<br>
-; CHECK: DW_AT_type [DW_FORM_ref4] (cu + 0x{{.*}} => {0x[[ENUM]]}<br>
+; CHECK: DW_AT_type [DW_FORM_ref4] (cu + 0x{{.*}} => {0x[[ENUM]]})<br>
<br>
; CHECK: DW_TAG_compile_unit<br>
; CHECK: DW_TAG_subprogram<br>
<br>
Modified: llvm/trunk/test/DebugInfo/Generic/member-pointers.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/member-pointers.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/member-pointers.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/Generic/member-pointers.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/Generic/member-pointers.ll Tue Oct 10 04:49:56 2017<br>
@@ -5,7 +5,7 @@<br>
; RUN: llvm-dwarfdump -v -debug-info %t | FileCheck %s<br>
; CHECK: DW_TAG_ptr_to_member_type<br>
; CHECK: DW_TAG_ptr_to_member_type<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE:0x[0-9a-f]+]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE:0x[0-9a-f]+]]})<br>
; CHECK: [[TYPE]]: DW_TAG_subroutine_type<br>
; CHECK: DW_TAG_formal_parameter<br>
; CHECK-NEXT: DW_AT_type<br>
<br>
Modified: llvm/trunk/test/DebugInfo/Generic/tu-composite.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/tu-composite.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/tu-composite.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/Generic/tu-composite.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/Generic/tu-composite.ll Tue Oct 10 04:49:56 2017<br>
@@ -32,21 +32,21 @@<br>
; CHECK-NEXT: DW_AT_name [DW_FORM_strp] {{.*}}= "virt<bar>")<br>
; Make sure we correctly handle type of a template_type being a type identifier.<br>
; CHECK: DW_TAG_template_type_parameter<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE2]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE2]]})<br>
; CHECK-NEXT: DW_AT_name [DW_FORM_strp] {{.*}}= "T")<br>
; Make sure we correctly handle derived-from of a typedef being a type identifier.<br>
; CHECK: DW_TAG_typedef<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE2]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE2]]})<br>
; CHECK: DW_AT_name [DW_FORM_strp] {{.*}}= "baz2")<br>
; Make sure we correctly handle derived-from of a pointer type being a type identifier.<br>
; CHECK: DW_TAG_pointer_type<br>
-; CHECK: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE]]}<br>
+; CHECK: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE]]})<br>
; CHECK: DW_TAG_typedef<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE2]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE2]]})<br>
; CHECK: DW_AT_name [DW_FORM_strp] {{.*}}= "baz")<br>
; Make sure we correctly handle derived-from of an array type being a type identifier.<br>
; CHECK: DW_TAG_array_type<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE2]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE2]]})<br>
; IR generated from clang -g with the following source:<br>
; struct C {<br>
; virtual void foo();<br>
<br>
Modified: llvm/trunk/test/DebugInfo/Generic/tu-member-pointer.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/tu-member-pointer.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/tu-member-pointer.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/Generic/tu-member-pointer.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/Generic/tu-member-pointer.ll Tue Oct 10 04:49:56 2017<br>
@@ -3,7 +3,7 @@<br>
; RUN: %llc_dwarf -filetype=obj -O0 < %s > %t<br>
; RUN: llvm-dwarfdump -v -debug-info %t | FileCheck %s<br>
; CHECK: DW_TAG_ptr_to_member_type<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE:0x[0-9a-f]+]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE:0x[0-9a-f]+]]})<br>
; CHECK: [[TYPE]]: DW_TAG_base_type<br>
; IR generated from clang -g with the following source:<br>
; struct Foo {<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/default-subrange-array.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/default-subrange-array.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/default-subrange-array.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/default-subrange-array.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/default-subrange-array.ll Tue Oct 10 04:49:56 2017<br>
@@ -18,7 +18,7 @@ source_filename = "test/DebugInfo/X86/de<br>
; CHECK: DW_TAG_class_type<br>
; CHECK: DW_TAG_member<br>
; CHECK-NEXT: DW_AT_name {{.*}} "x"<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] {{.*}} => {[[ARRAY:0x[0-9a-f]+]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] {{.*}} => {[[ARRAY:0x[0-9a-f]+]]})<br>
<br>
; CHECK: [[ARRAY]]: DW_TAG_array_type<br>
; CHECK-NEXT: DW_AT_type<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=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/empty-array.ll?rev=315299&r1=315298&r2=315299&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 10 04:49:56 2017<br>
@@ -10,13 +10,13 @@ source_filename = "test/DebugInfo/X86/em<br>
; CHECK: DW_TAG_class_type<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:0x[0-9a-f]*]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[ARRAY:0x[0-9a-f]*]]})<br>
<br>
; CHECK: [[ARRAY]]: DW_TAG_array_type [{{.*}}] *<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASETYPE:0x[0-9a-f]*]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASETYPE:0x[0-9a-f]*]]})<br>
<br>
; CHECK: DW_TAG_subrange_type<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASE2:0x[0-9a-f]*]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASE2:0x[0-9a-f]*]]})<br>
; CHECK-NOT: DW_AT_upper_bound<br>
<br>
; CHECK: [[BASETYPE]]: DW_TAG_base_type<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=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/fission-cu.ll?rev=315299&r1=315298&r2=315299&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 10 04:49:56 2017<br>
@@ -75,7 +75,7 @@ source_filename = "test/DebugInfo/X86/fi<br>
; CHECK: DW_AT_GNU_dwo_id [DW_FORM_data8] (0x1f1f859683d49324)<br>
; CHECK: DW_TAG_variable<br>
; CHECK: DW_AT_name [DW_FORM_GNU_str_index] ( indexed (00000003) string = "a")<br>
-; CHECK: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[TYPE:0x[0-9a-f]*]]}<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] (1)<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=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/nondefault-subrange-array.ll?rev=315299&r1=315298&r2=315299&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 10 04:49:56 2017<br>
@@ -12,13 +12,13 @@ source_filename = "test/DebugInfo/X86/no<br>
; CHECK: DW_TAG_class_type<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:0x[0-9a-f]*]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[ARRAY:0x[0-9a-f]*]]})<br>
<br>
; CHECK: [[ARRAY]]: DW_TAG_array_type [{{.*}}] *<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASE:0x[0-9a-f]*]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASE:0x[0-9a-f]*]]})<br>
<br>
; CHECK: DW_TAG_subrange_type<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASE2:0x[0-9a-f]*]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[BASE2:0x[0-9a-f]*]]})<br>
; CHECK-NEXT: DW_AT_lower_bound [DW_FORM_data8] (0xfffffffffffffffd)<br>
; CHECK-NEXT: DW_AT_count [DW_FORM_data1] (0x2a)<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/ref_addr_relocation.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/ref_addr_relocation.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/ref_addr_relocation.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/ref_addr_relocation.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/ref_addr_relocation.ll Tue Oct 10 04:49:56 2017<br>
@@ -57,11 +57,11 @@<br>
; CHECK-DWARF: 0x[[ADDR:.*]]: DW_TAG_structure_type<br>
; CHECK-DWARF: DW_TAG_compile_unit<br>
; CHECK-DWARF: DW_TAG_variable<br>
-; CHECK-DWARF: DW_AT_type [DW_FORM_ref_addr] {{.*}}[[ADDR]]<br>
+; CHECK-DWARF: DW_AT_type [DW_FORM_ref_addr] {{.*}}[[ADDR]])<br>
<br>
; CHECK-DWARF2: DW_TAG_compile_unit<br>
; CHECK-DWARF2: DW_TAG_variable<br>
-; CHECK-DWARF2: DW_AT_type [DW_FORM_ref4] {{.*}} => {[[ADDR:.*]]}<br>
+; CHECK-DWARF2: DW_AT_type [DW_FORM_ref4] {{.*}} => {[[ADDR:.*]]})<br>
; CHECK-DWARF2: [[ADDR]]: DW_TAG_structure_type<br>
<br>
source_filename = "test/DebugInfo/X86/ref_addr_relocation.ll"<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/subrange-type.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/subrange-type.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/subrange-type.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/X86/subrange-type.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/subrange-type.ll Tue Oct 10 04:49:56 2017<br>
@@ -3,7 +3,7 @@<br>
<br>
; Make sure that the base type from the subrange type has a name.<br>
; CHECK: DW_TAG_subrange_type<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]+}} => {[[SUBTYPE:0x[0-9a-f]*]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]+}} => {[[SUBTYPE:0x[0-9a-f]*]]})<br>
; CHECK: [[SUBTYPE]]: DW_TAG_base_type<br>
; CHECK-NEXT: DW_AT_name<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/dwarfdump-type-units.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dwarfdump-type-units.test?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dwarfdump-type-units.test?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/dwarfdump-type-units.test (original)<br>
+++ llvm/trunk/test/DebugInfo/dwarfdump-type-units.test Tue Oct 10 04:49:56 2017<br>
@@ -6,11 +6,11 @@ CHECK: debug_info contents:<br>
<br>
CHECK: DW_TAG_variable<br>
CHECK-NEXT: DW_AT_name {{.*}}"f"<br>
-CHECK: DW_AT_type [DW_FORM_ref_sig8] ([[FOO_SIG:0x[0-9a-f]*]]<br>
+CHECK: DW_AT_type [DW_FORM_ref_sig8] ([[FOO_SIG:0x[0-9a-f]*]])<br>
<br>
CHECK: DW_TAG_variable<br>
CHECK-NEXT: DW_AT_name {{.*}}"b"<br>
-CHECK: DW_AT_type [DW_FORM_ref_sig8] ([[BAR_SIG:0x[0-9a-f]*]]<br>
+CHECK: DW_AT_type [DW_FORM_ref_sig8] ([[BAR_SIG:0x[0-9a-f]*]])<br>
<br>
<br>
CHECK: debug_types contents:<br>
<br>
Modified: llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll (original)<br>
+++ llvm/trunk/test/Linker/Inputs/type-unique-simple2-a.ll Tue Oct 10 04:49:56 2017<br>
@@ -8,9 +8,9 @@<br>
<br>
; CHECK: DW_TAG_compile_unit<br>
; CHECK: DW_TAG_formal_parameter<br>
-; CHECK: DW_AT_type [DW_FORM_ref_addr] {{.*}}[[INT]]<br>
+; CHECK: DW_AT_type [DW_FORM_ref_addr] {{.*}}[[INT]])<br>
; CHECK: DW_TAG_variable<br>
-; CHECK: DW_AT_type [DW_FORM_ref_addr] {{.*}}[[BASE]]<br>
+; CHECK: DW_AT_type [DW_FORM_ref_addr] {{.*}}[[BASE]])<br>
<br>
; Make sure llvm-link only generates a single copy of the struct.<br>
; LINK: DW_TAG_structure_type<br>
<br>
Modified: llvm/trunk/test/Linker/type-unique-simple-a.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple-a.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple-a.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-simple-a.ll (original)<br>
+++ llvm/trunk/test/Linker/type-unique-simple-a.ll Tue Oct 10 04:49:56 2017<br>
@@ -15,9 +15,9 @@<br>
<br>
; CHECK: DW_TAG_compile_unit<br>
; CHECK: DW_TAG_formal_parameter<br>
-; CHECK: DW_AT_type [DW_FORM_ref_addr] {{.*}}[[INT]]<br>
+; CHECK: DW_AT_type [DW_FORM_ref_addr] {{.*}}[[INT]])<br>
; CHECK: DW_TAG_variable<br>
-; CHECK: DW_AT_type [DW_FORM_ref_addr] {{.*}}[[BASE]]<br>
+; CHECK: DW_AT_type [DW_FORM_ref_addr] {{.*}}[[BASE]])<br>
<br>
; Make sure llvm-link only generates a single copy of the struct.<br>
; LINK: DW_TAG_structure_type<br>
<br>
Modified: llvm/trunk/test/Linker/type-unique-type-array-a.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-type-array-a.ll?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-type-array-a.ll?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-type-array-a.ll (original)<br>
+++ llvm/trunk/test/Linker/type-unique-type-array-a.ll Tue Oct 10 04:49:56 2017<br>
@@ -26,7 +26,7 @@<br>
; CHECK: DW_AT_name {{.*}} "testA"<br>
; CHECK: DW_TAG_formal_parameter<br>
; CHECK: DW_TAG_formal_parameter<br>
-; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{.*}} => {0x[[STRUCT:.*]]}<br>
+; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x{{.*}} => {0x[[STRUCT:.*]]})<br>
; CHECK: 0x[[STRUCT]]: DW_TAG_structure_type<br>
; CHECK-NEXT: DW_AT_name {{.*}} "SA"<br>
<br>
<br>
Modified: llvm/trunk/test/tools/dsymutil/X86/basic-linking-x86.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/basic-linking-x86.test?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/basic-linking-x86.test?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/dsymutil/X86/basic-linking-x86.test (original)<br>
+++ llvm/trunk/test/tools/dsymutil/X86/basic-linking-x86.test Tue Oct 10 04:49:56 2017<br>
@@ -26,7 +26,7 @@ CHECK: DW_AT_name ("main")<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic1.c")<br>
CHECK: DW_AT_decl_line (23)<br>
CHECK: DW_AT_prototyped (0x01)<br>
-CHECK: DW_AT_type (cu + 0x0063<br>
+CHECK: DW_AT_type (cu + 0x0063)<br>
CHECK: DW_AT_external (0x01)<br>
CHECK: DW_AT_accessibility (DW_ACCESS_public)<br>
CHECK: DW_AT_low_pc (0x0000000100000ea0)<br>
@@ -36,13 +36,13 @@ CHECK: DW_TAG_formal_parameter<br>
CHECK: DW_AT_name ("argc")<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic1.c")<br>
CHECK: DW_AT_decl_line (23)<br>
-CHECK: DW_AT_type (cu + 0x0063<br>
+CHECK: DW_AT_type (cu + 0x0063)<br>
CHECK: DW_AT_location (DW_OP_fbreg -8)<br>
CHECK: DW_TAG_formal_parameter<br>
CHECK: DW_AT_name ("argv")<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic1.c")<br>
CHECK: DW_AT_decl_line (23)<br>
-CHECK: DW_AT_type (cu + 0x006a<br>
+CHECK: DW_AT_type (cu + 0x006a)<br>
CHECK: DW_AT_location (DW_OP_fbreg -16)<br>
CHECK: NULL<br>
CHECK: DW_TAG_base_type<br>
@@ -50,11 +50,11 @@ CHECK: DW_AT_name ("int")<br>
CHECK: DW_AT_encoding (DW_ATE_signed)<br>
CHECK: DW_AT_byte_size (0x04)<br>
CHECK: DW_TAG_pointer_type<br>
-CHECK: DW_AT_type (cu + 0x006f<br>
+CHECK: DW_AT_type (cu + 0x006f)<br>
CHECK: DW_TAG_pointer_type<br>
-CHECK: DW_AT_type (cu + 0x0074<br>
+CHECK: DW_AT_type (cu + 0x0074)<br>
CHECK: DW_TAG_const_type<br>
-CHECK: DW_AT_type (cu + 0x0079<br>
+CHECK: DW_AT_type (cu + 0x0079)<br>
CHECK: DW_TAG_base_type<br>
CHECK: DW_AT_name ("char")<br>
CHECK: DW_AT_encoding (DW_ATE_signed_char)<br>
@@ -73,30 +73,30 @@ CHECK: DW_TAG_base_type<br>
CHECK: DW_AT_name ("int")<br>
CHECK: DW_TAG_variable<br>
CHECK: DW_AT_name ("private_int")<br>
-CHECK: DW_AT_type (cu + 0x0026<br>
+CHECK: DW_AT_type (cu + 0x0026)<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic2.c")<br>
BASIC: DW_AT_location (DW_OP_addr 0x100001008)<br>
ARCHIVE: DW_AT_location (DW_OP_addr 0x100001004)<br>
CHECK: DW_TAG_variable<br>
CHECK: DW_AT_name ("baz")<br>
-CHECK: DW_AT_type (cu + 0x0026<br>
+CHECK: DW_AT_type (cu + 0x0026)<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic2.c")<br>
CHECK: DW_AT_location (DW_OP_addr 0x100001000)<br>
CHECK: DW_TAG_subprogram<br>
CHECK: DW_AT_name ("foo")<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic2.c")<br>
-CHECK: DW_AT_type (cu + 0x0026<br>
+CHECK: DW_AT_type (cu + 0x0026)<br>
CHECK: DW_AT_low_pc (0x0000000100000ed0)<br>
CHECK: DW_AT_high_pc (0x0000000100000f19)<br>
CHECK: DW_AT_frame_base (DW_OP_reg6 RBP)<br>
CHECK: DW_TAG_formal_parameter<br>
CHECK: DW_AT_name ("arg")<br>
-CHECK: DW_AT_type (cu + 0x0026<br>
+CHECK: DW_AT_type (cu + 0x0026)<br>
CHECK: DW_AT_location (DW_OP_fbreg -4)<br>
CHECK: NULL<br>
CHECK: DW_TAG_subprogram<br>
CHECK: DW_AT_name ("inc")<br>
-CHECK: DW_AT_type (cu + 0x0026<br>
+CHECK: DW_AT_type (cu + 0x0026)<br>
CHECK: DW_AT_low_pc (0x0000000100000f20)<br>
CHECK: DW_AT_high_pc (0x0000000100000f37)<br>
CHECK: DW_AT_frame_base (DW_OP_reg6 RBP)<br>
@@ -112,28 +112,28 @@ CHECK: DW_AT_comp_dir ("/Inputs")<br>
CHECK: DW_AT_low_pc (0x0000000100000f40)<br>
CHECK: DW_TAG_variable<br>
CHECK: DW_AT_name ("val")<br>
-CHECK: DW_AT_type (cu + 0x003c<br>
+CHECK: DW_AT_type (cu + 0x003c)<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic3.c")<br>
BASIC: DW_AT_location (DW_OP_addr 0x100001004)<br>
ARCHIVE: DW_AT_location (DW_OP_addr 0x100001008)<br>
CHECK: DW_TAG_volatile_type<br>
-CHECK: DW_AT_type (cu + 0x0041<br>
+CHECK: DW_AT_type (cu + 0x0041)<br>
CHECK: DW_TAG_base_type<br>
CHECK: DW_AT_name ("int")<br>
CHECK: DW_TAG_subprogram<br>
CHECK: DW_AT_name ("bar")<br>
-CHECK: DW_AT_type (cu + 0x0041<br>
+CHECK: DW_AT_type (cu + 0x0041)<br>
CHECK: DW_AT_low_pc (0x0000000100000f40)<br>
CHECK: DW_AT_high_pc (0x0000000100000f84)<br>
CHECK: DW_AT_frame_base (DW_OP_reg6 RBP)<br>
CHECK: DW_TAG_formal_parameter<br>
CHECK: DW_AT_name ("arg")<br>
-CHECK: DW_AT_type (cu + 0x0041<br>
+CHECK: DW_AT_type (cu + 0x0041)<br>
CHECK: DW_AT_location (DW_OP_fbreg -8)<br>
CHECK: NULL<br>
CHECK: DW_TAG_subprogram<br>
CHECK: DW_AT_name ("inc")<br>
-CHECK: DW_AT_type (cu + 0x0041<br>
+CHECK: DW_AT_type (cu + 0x0041)<br>
CHECK: DW_AT_low_pc (0x0000000100000f90)<br>
CHECK: DW_AT_high_pc (0x0000000100000fa9)<br>
CHECK: DW_AT_frame_base (DW_OP_reg6 RBP)<br>
<br>
Modified: llvm/trunk/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test (original)<br>
+++ llvm/trunk/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test Tue Oct 10 04:49:56 2017<br>
@@ -20,20 +20,20 @@ CHECK: DW_AT_frame_base (DW_OP_reg6<br>
CHECK: DW_AT_name ("main")<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic1.c")<br>
CHECK: DW_AT_prototyped (true)<br>
-CHECK: DW_AT_type (0x00000000000000a1<br>
+CHECK: DW_AT_type (0x00000000000000a1)<br>
CHECK: DW_AT_external (true)<br>
CHECK: DW_TAG_formal_parameter<br>
CHECK: DW_AT_location (DW_OP_reg5 RDI, DW_OP_piece 0x4)<br>
CHECK: DW_AT_name ("argc")<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic1.c")<br>
-CHECK: DW_AT_type (0x00000000000000a1<br>
+CHECK: DW_AT_type (0x00000000000000a1)<br>
CHECK: DW_TAG_formal_parameter<br>
CHECK: DW_AT_location (DW_OP_reg4 RSI)<br>
CHECK: DW_AT_name ("argv")<br>
-CHECK: DW_AT_type (cu + 0x0060<br>
+CHECK: DW_AT_type (cu + 0x0060)<br>
CHECK: NULL<br>
CHECK: DW_TAG_pointer_type<br>
-CHECK: DW_AT_type (cu + 0x0065<br>
+CHECK: DW_AT_type (cu + 0x0065)<br>
CHECK: DW_TAG_pointer_type<br>
CHECK: DW_TAG_const_type<br>
CHECK: DW_TAG_base_type<br>
@@ -62,7 +62,7 @@ CHECK: DW_AT_decl_file ("/Inputs{{[<br>
CHECK: DW_AT_location (DW_OP_addr 0x100001008)<br>
CHECK: DW_TAG_subprogram<br>
CHECK: DW_AT_name ("inc")<br>
-CHECK: DW_AT_type (cu + 0x002a<br>
+CHECK: DW_AT_type (cu + 0x002a)<br>
CHECK: DW_AT_inline (DW_INL_inlined)<br>
CHECK: DW_TAG_subprogram<br>
CHECK: DW_AT_low_pc (0x0000000100000f50)<br>
@@ -71,12 +71,12 @@ CHECK: DW_AT_frame_base (DW_OP_reg6<br>
CHECK: DW_AT_name ("foo")<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic2.c")<br>
CHECK: DW_AT_prototyped (true)<br>
-CHECK: DW_AT_type (cu + 0x002a<br>
+CHECK: DW_AT_type (cu + 0x002a)<br>
CHECK: DW_TAG_formal_parameter<br>
CHECK: DW_AT_location (0x00000000<br>
CHECK: 0x0000000000000000 - 0x000000000000000c: DW_OP_reg5 RDI, DW_OP_piece 0x4)<br>
CHECK: DW_AT_name ("arg")<br>
-CHECK: DW_AT_type (cu + 0x002a<br>
+CHECK: DW_AT_type (cu + 0x002a)<br>
CHECK: DW_TAG_inlined_subroutine<br>
CHECK: DW_AT_abstract_origin (cu + 0x005b "inc")<br>
CHECK: DW_AT_low_pc (0x0000000100000f61)<br>
<br>
Modified: llvm/trunk/test/tools/dsymutil/X86/basic-lto-linking-x86.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/basic-lto-linking-x86.test?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/basic-lto-linking-x86.test?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/dsymutil/X86/basic-lto-linking-x86.test (original)<br>
+++ llvm/trunk/test/tools/dsymutil/X86/basic-lto-linking-x86.test Tue Oct 10 04:49:56 2017<br>
@@ -19,7 +19,7 @@ CHECK: DW_AT_name ("main")<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic1.c")<br>
CHECK: DW_AT_decl_line (23)<br>
CHECK: DW_AT_prototyped (0x01)<br>
-CHECK: DW_AT_type (cu + 0x0063<br>
+CHECK: DW_AT_type (cu + 0x0063)<br>
CHECK: DW_AT_external (0x01)<br>
CHECK: DW_AT_accessibility (DW_ACCESS_public)<br>
CHECK: DW_AT_low_pc (0x0000000100000f40)<br>
@@ -27,11 +27,11 @@ CHECK: DW_AT_high_pc (0x00000001000<br>
CHECK: DW_AT_frame_base (DW_OP_reg6 RBP)<br>
CHECK: DW_TAG_formal_parameter<br>
CHECK: DW_AT_name ("argc")<br>
-CHECK: DW_AT_type (cu + 0x0063<br>
+CHECK: DW_AT_type (cu + 0x0063)<br>
CHECK: DW_AT_location (DW_OP_reg5 RDI, DW_OP_piece 0x4)<br>
CHECK: DW_TAG_formal_parameter<br>
CHECK: DW_AT_name ("argv")<br>
-CHECK: DW_AT_type (cu + 0x006a<br>
+CHECK: DW_AT_type (cu + 0x006a)<br>
CHECK: DW_AT_location (DW_OP_reg4 RSI)<br>
CHECK: NULL<br>
CHECK: DW_TAG_base_type<br>
@@ -39,11 +39,11 @@ CHECK: DW_AT_name ("int")<br>
CHECK: DW_AT_encoding (DW_ATE_signed)<br>
CHECK: DW_AT_byte_size (0x04)<br>
CHECK: DW_TAG_pointer_type<br>
-CHECK: DW_AT_type (cu + 0x006f<br>
+CHECK: DW_AT_type (cu + 0x006f)<br>
CHECK: DW_TAG_pointer_type<br>
-CHECK: DW_AT_type (cu + 0x0074<br>
+CHECK: DW_AT_type (cu + 0x0074)<br>
CHECK: DW_TAG_const_type<br>
-CHECK: DW_AT_type (cu + 0x0079<br>
+CHECK: DW_AT_type (cu + 0x0079)<br>
CHECK: DW_TAG_base_type<br>
CHECK: DW_AT_name ("char")<br>
CHECK: DW_AT_encoding (DW_ATE_signed_char)<br>
@@ -60,22 +60,22 @@ CHECK: DW_AT_comp_dir ("/Inputs")<br>
CHECK: DW_AT_low_pc (0x0000000100000f50)<br>
CHECK: DW_TAG_variable<br>
CHECK: DW_AT_name ("private_int")<br>
-CHECK: DW_AT_type (0x0000000000000063<br>
+CHECK: DW_AT_type (0x0000000000000063)<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic2.c")<br>
CHECK: DW_AT_location (DW_OP_addr 0x100001008)<br>
CHECK: DW_TAG_variable<br>
CHECK: DW_AT_name ("baz")<br>
-CHECK: DW_AT_type (0x0000000000000063<br>
+CHECK: DW_AT_type (0x0000000000000063)<br>
CHECK: DW_AT_location (DW_OP_addr 0x100001000)<br>
CHECK: DW_TAG_subprogram<br>
CHECK: DW_AT_name ("foo")<br>
-CHECK: DW_AT_type (0x0000000000000063<br>
+CHECK: DW_AT_type (0x0000000000000063)<br>
CHECK: DW_AT_low_pc (0x0000000100000f50)<br>
CHECK: DW_AT_high_pc (0x0000000100000f89)<br>
CHECK: DW_AT_frame_base (DW_OP_reg6 RBP)<br>
CHECK: DW_TAG_formal_parameter<br>
CHECK: DW_AT_name ("arg")<br>
-CHECK: DW_AT_type (0x0000000000000063<br>
+CHECK: DW_AT_type (0x0000000000000063)<br>
CHECK: DW_AT_location (0x00000000<br>
CHECK: 0x0000000000000000 - 0x000000000000000e: DW_OP_reg5 RDI, DW_OP_piece 0x4)<br>
CHECK: DW_TAG_inlined_subroutine<br>
@@ -86,7 +86,7 @@ CHECK: DW_AT_call_line (20)<br>
CHECK: NULL<br>
CHECK: DW_TAG_subprogram<br>
CHECK: DW_AT_name ("inc")<br>
-CHECK: DW_AT_type (0x0000000000000063<br>
+CHECK: DW_AT_type (0x0000000000000063)<br>
CHECK: DW_AT_inline (DW_INL_inlined)<br>
CHECK: NULL<br>
<br>
@@ -100,20 +100,20 @@ CHECK: DW_AT_comp_dir ("/Inputs")<br>
CHECK: DW_AT_low_pc (0x0000000100000f90)<br>
CHECK: DW_TAG_variable<br>
CHECK: DW_AT_name ("val")<br>
-CHECK: DW_AT_type (cu + 0x003c<br>
+CHECK: DW_AT_type (cu + 0x003c)<br>
CHECK: DW_AT_decl_file ("/Inputs{{[/\\]}}basic3.c")<br>
CHECK: DW_AT_location (DW_OP_addr 0x100001004)<br>
CHECK: DW_TAG_volatile_type<br>
-CHECK: DW_AT_type (0x0000000000000063<br>
+CHECK: DW_AT_type (0x0000000000000063)<br>
CHECK: DW_TAG_subprogram<br>
CHECK: DW_AT_name ("bar")<br>
-CHECK: DW_AT_type (0x0000000000000063<br>
+CHECK: DW_AT_type (0x0000000000000063)<br>
CHECK: DW_AT_low_pc (0x0000000100000f90)<br>
CHECK: DW_AT_high_pc (0x0000000100000fb4)<br>
CHECK: DW_AT_frame_base (DW_OP_reg6 RBP)<br>
CHECK: DW_TAG_formal_parameter<br>
CHECK: DW_AT_name ("arg")<br>
-CHECK: DW_AT_type (0x0000000000000063<br>
+CHECK: DW_AT_type (0x0000000000000063)<br>
CHECK: DW_AT_location (0x00000025<br>
CHECK: 0x0000000000000000 - 0x000000000000000f: DW_OP_reg5 RDI, DW_OP_piece 0x4<br>
CHECK: 0x0000000000000019 - 0x000000000000001d: DW_OP_reg5 RDI, DW_OP_piece 0x4)<br>
@@ -129,7 +129,7 @@ CHECK: NULL<br>
CHECK: NULL<br>
CHECK: DW_TAG_subprogram<br>
CHECK: DW_AT_name ("inc")<br>
-CHECK: DW_AT_type (0x0000000000000063<br>
+CHECK: DW_AT_type (0x0000000000000063)<br>
CHECK: NULL<br>
<br>
CHECK: .debug_loc contents:<br>
<br>
Modified: llvm/trunk/test/tools/dsymutil/X86/modules.m<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/modules.m?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/modules.m?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/dsymutil/X86/modules.m (original)<br>
+++ llvm/trunk/test/tools/dsymutil/X86/modules.m Tue Oct 10 04:49:56 2017<br>
@@ -61,7 +61,7 @@ struct PruneMeNot;<br>
// CHECK-NOT: DW_TAG<br>
// CHECK: 0x0[[BARTD:.*]]: DW_TAG_typedef<br>
// CHECK-NOT: DW_TAG<br>
-// CHECK: DW_AT_type [DW_FORM_ref_addr] (0x{{0*}}[[BAR]]<br>
+// CHECK: DW_AT_type [DW_FORM_ref_addr] (0x{{0*}}[[BAR]])<br>
// CHECK: DW_TAG_structure_type<br>
// CHECK-NEXT: DW_AT_name{{.*}}"S"<br>
// CHECK-NOT: DW_TAG<br>
@@ -116,7 +116,7 @@ Bar odr_violation = { 42 };<br>
// CHECK: DW_AT_type {{.*}}{0x{{0*}}[[PTR:.*]]}<br>
//<br>
// CHECK: 0x{{0*}}[[PTR]]: DW_TAG_pointer_type<br>
-// CHECK-NEXT DW_AT_type [DW_FORM_ref_addr] {0x{{0*}}[[INTERFACE]]<br>
+// CHECK-NEXT DW_AT_type [DW_FORM_ref_addr] {0x{{0*}}[[INTERFACE]])<br>
extern int odr_violation;<br>
<br>
@import Foo;<br>
@@ -134,9 +134,9 @@ int main(int argc, char **argv) {<br>
// CHECK: DW_AT_name {{.*}}"odr_violation.c"<br>
// CHECK: DW_TAG_variable<br>
// CHECK: DW_AT_name {{.*}}"odr_violation"<br>
-// CHECK: DW_AT_type [DW_FORM_ref4] ({{.*}}{0x{{0*}}[[BAR2:.*]]}<br>
+// CHECK: DW_AT_type [DW_FORM_ref4] ({{.*}}{0x{{0*}}[[BAR2:.*]]})<br>
// CHECK: 0x{{0*}}[[BAR2]]: DW_TAG_typedef<br>
-// CHECK: DW_AT_type [DW_FORM_ref4] ({{.*}}{0x{{0*}}[[BAR3:.*]]}<br>
+// CHECK: DW_AT_type [DW_FORM_ref4] ({{.*}}{0x{{0*}}[[BAR3:.*]]})<br>
// CHECK: DW_AT_name {{.*}}"Bar"<br>
// CHECK: 0x{{0*}}[[BAR3]]: DW_TAG_structure_type<br>
// CHECK-NEXT: DW_AT_name {{.*}}"Bar"<br>
<br>
Modified: llvm/trunk/test/tools/dsymutil/X86/odr-member-functions.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/odr-member-functions.cpp?rev=315299&r1=315298&r2=315299&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/odr-member-functions.cpp?rev=315299&r1=315298&r2=315299&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/dsymutil/X86/odr-member-functions.cpp (original)<br>
+++ llvm/trunk/test/tools/dsymutil/X86/odr-member-functions.cpp Tue Oct 10 04:49:56 2017<br>
@@ -61,7 +61,7 @@ void foo() {<br>
// CHECK-NOT: DW_TAG<br>
// CHECK: DW_AT_name {{.*}}"s"<br>
// CHECK-NOT: DW_TAG<br>
-// CHECK: DW_AT_type {{.*}}[[S]]<br>
+// CHECK: DW_AT_type {{.*}}[[S]])<br>
// CHECK: DW_TAG_inlined_subroutine<br>
// CHECK-NEXT: DW_AT_abstract_origin{{.*}}[[FOO_SUB]]<br>
// CHECK-NOT: DW_TAG<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div></div>