<div dir="ltr">Generally it'd be great to include details of why a patch is reverted in the patch description - good breadcrumbs for the peanut gallery, or if someone else decides to pick up this work another time, etc.</div><br><div class="gmail_quote"><div dir="ltr">On Tue, Aug 22, 2017 at 3:00 PM Jonas Devlieghere via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">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 Aug 22 14:59:46 2017<br>
New Revision: 311499<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=311499&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=311499&view=rev</a><br>
Log:<br>
Revert "[llvm-dwarfdump] Print type names in DW_AT_type DIEs"<br>
<br>
This reverts commit r311492.<br>
<br>
Removed:<br>
llvm/trunk/test/tools/llvm-dwarfdump/X86/verify_type_names.s<br>
Modified:<br>
llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.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=311499&r1=311498&r2=311499&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp?rev=311499&r1=311498&r2=311499&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp (original)<br>
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp Tue Aug 22 14:59:46 2017<br>
@@ -135,8 +135,7 @@ static void dumpAttribute(raw_ostream &O<br>
// We have dumped the attribute raw value. For some attributes<br>
// having both the raw value and the pretty-printed value is<br>
// interesting. These attributes are handled below.<br>
- if (Attr == DW_AT_specification || Attr == DW_AT_abstract_origin ||<br>
- Attr == DW_AT_type) {<br>
+ if (Attr == DW_AT_specification || Attr == DW_AT_abstract_origin) {<br>
if (const char *Name = Die.getAttributeValueAsReferencedDie(Attr).getName(DINameKind::LinkageName))<br>
OS << " \"" << Name << '\"';<br>
} else if (Attr == DW_AT_APPLE_property_attribute) {<br>
<br>
Removed: llvm/trunk/test/tools/llvm-dwarfdump/X86/verify_type_names.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwarfdump/X86/verify_type_names.s?rev=311498&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwarfdump/X86/verify_type_names.s?rev=311498&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/llvm-dwarfdump/X86/verify_type_names.s (original)<br>
+++ llvm/trunk/test/tools/llvm-dwarfdump/X86/verify_type_names.s (removed)<br>
@@ -1,317 +0,0 @@<br>
-# RUN: llvm-mc %s -filetype obj -triple x86_64-apple-darwin -o - \<br>
-# RUN: | llvm-dwarfdump -debug-dump=info - \<br>
-# RUN: | FileCheck %s<br>
-<br>
-# $ cat verify_type_names.cpp<br>
-# struct Struct {<br>
-# int i;<br>
-# };<br>
-#<br>
-# Struct Fn(int i) { return {i}; }<br>
-# $ clang++ -g -S verify_type_names.cpp -std=c++11<br>
-<br>
-# CHECK: DW_TAG_subprogram<br>
-# CHECK: DW_AT_type {{.*}} "Struct"<br>
-# CHECK: DW_TAG_formal_parameter<br>
-# CHECK: DW_AT_type {{.*}} "int"<br>
-# CHECK: DW_TAG_member<br>
-# CHECK: DW_AT_type {{.*}} "int"<br>
-<br>
- .section __TEXT,__text,regular,pure_instructions<br>
- .macosx_version_min 10, 12<br>
- .globl __Z2Fni ## -- Begin function _Z2Fni<br>
- .p2align 4, 0x90<br>
-__Z2Fni: ## @_Z2Fni<br>
-Lfunc_begin0:<br>
- .file 1 "verify_type_names.cpp"<br>
- .loc 1 5 0 ## verify_type_names.cpp:5:0<br>
- .cfi_startproc<br>
-## BB#0: ## %entry<br>
- pushq %rbp<br>
-Lcfi0:<br>
- .cfi_def_cfa_offset 16<br>
-Lcfi1:<br>
- .cfi_offset %rbp, -16<br>
- movq %rsp, %rbp<br>
-Lcfi2:<br>
- .cfi_def_cfa_register %rbp<br>
- movl %edi, -12(%rbp)<br>
-Ltmp0:<br>
- .loc 1 5 28 prologue_end ## verify_type_names.cpp:5:28<br>
- movl -12(%rbp), %edi<br>
- .loc 1 5 27 is_stmt 0 ## verify_type_names.cpp:5:27<br>
- movl %edi, -8(%rbp)<br>
- .loc 1 5 20 ## verify_type_names.cpp:5:20<br>
- movl -8(%rbp), %eax<br>
- popq %rbp<br>
- retq<br>
-Ltmp1:<br>
-Lfunc_end0:<br>
- .cfi_endproc<br>
- ## -- End function<br>
- .section __DWARF,__debug_str,regular,debug<br>
-Linfo_string:<br>
- .asciz "clang version 6.0.0 (trunk 311115) (llvm/trunk 311450)" ## string offset=0<br>
- .asciz "verify_type_names.cpp" ## string offset=55<br>
- .asciz "/private/tmp" ## string offset=77<br>
- .asciz "Fn" ## string offset=90<br>
- .asciz "_Z2Fni" ## string offset=93<br>
- .asciz "Struct" ## string offset=100<br>
- .asciz "i" ## string offset=107<br>
- .asciz "int" ## string offset=109<br>
- .section __DWARF,__debug_abbrev,regular,debug<br>
-Lsection_abbrev:<br>
- .byte 1 ## Abbreviation Code<br>
- .byte 17 ## DW_TAG_compile_unit<br>
- .byte 1 ## DW_CHILDREN_yes<br>
- .byte 37 ## DW_AT_producer<br>
- .byte 14 ## DW_FORM_strp<br>
- .byte 19 ## DW_AT_language<br>
- .byte 5 ## DW_FORM_data2<br>
- .byte 3 ## DW_AT_name<br>
- .byte 14 ## DW_FORM_strp<br>
- .byte 16 ## DW_AT_stmt_list<br>
- .byte 23 ## DW_FORM_sec_offset<br>
- .byte 27 ## DW_AT_comp_dir<br>
- .byte 14 ## DW_FORM_strp<br>
- .byte 17 ## DW_AT_low_pc<br>
- .byte 1 ## DW_FORM_addr<br>
- .byte 18 ## DW_AT_high_pc<br>
- .byte 6 ## DW_FORM_data4<br>
- .byte 0 ## EOM(1)<br>
- .byte 0 ## EOM(2)<br>
- .byte 2 ## Abbreviation Code<br>
- .byte 46 ## DW_TAG_subprogram<br>
- .byte 1 ## DW_CHILDREN_yes<br>
- .byte 17 ## DW_AT_low_pc<br>
- .byte 1 ## DW_FORM_addr<br>
- .byte 18 ## DW_AT_high_pc<br>
- .byte 6 ## DW_FORM_data4<br>
- .byte 64 ## DW_AT_frame_base<br>
- .byte 24 ## DW_FORM_exprloc<br>
- .byte 110 ## DW_AT_linkage_name<br>
- .byte 14 ## DW_FORM_strp<br>
- .byte 3 ## DW_AT_name<br>
- .byte 14 ## DW_FORM_strp<br>
- .byte 58 ## DW_AT_decl_file<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 59 ## DW_AT_decl_line<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 73 ## DW_AT_type<br>
- .byte 19 ## DW_FORM_ref4<br>
- .byte 63 ## DW_AT_external<br>
- .byte 25 ## DW_FORM_flag_present<br>
- .byte 0 ## EOM(1)<br>
- .byte 0 ## EOM(2)<br>
- .byte 3 ## Abbreviation Code<br>
- .byte 5 ## DW_TAG_formal_parameter<br>
- .byte 0 ## DW_CHILDREN_no<br>
- .byte 2 ## DW_AT_location<br>
- .byte 24 ## DW_FORM_exprloc<br>
- .byte 3 ## DW_AT_name<br>
- .byte 14 ## DW_FORM_strp<br>
- .byte 58 ## DW_AT_decl_file<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 59 ## DW_AT_decl_line<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 73 ## DW_AT_type<br>
- .byte 19 ## DW_FORM_ref4<br>
- .byte 0 ## EOM(1)<br>
- .byte 0 ## EOM(2)<br>
- .byte 4 ## Abbreviation Code<br>
- .byte 19 ## DW_TAG_structure_type<br>
- .byte 1 ## DW_CHILDREN_yes<br>
- .byte 3 ## DW_AT_name<br>
- .byte 14 ## DW_FORM_strp<br>
- .byte 11 ## DW_AT_byte_size<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 58 ## DW_AT_decl_file<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 59 ## DW_AT_decl_line<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 0 ## EOM(1)<br>
- .byte 0 ## EOM(2)<br>
- .byte 5 ## Abbreviation Code<br>
- .byte 13 ## DW_TAG_member<br>
- .byte 0 ## DW_CHILDREN_no<br>
- .byte 3 ## DW_AT_name<br>
- .byte 14 ## DW_FORM_strp<br>
- .byte 73 ## DW_AT_type<br>
- .byte 19 ## DW_FORM_ref4<br>
- .byte 58 ## DW_AT_decl_file<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 59 ## DW_AT_decl_line<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 56 ## DW_AT_data_member_location<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 0 ## EOM(1)<br>
- .byte 0 ## EOM(2)<br>
- .byte 6 ## Abbreviation Code<br>
- .byte 36 ## DW_TAG_base_type<br>
- .byte 0 ## DW_CHILDREN_no<br>
- .byte 3 ## DW_AT_name<br>
- .byte 14 ## DW_FORM_strp<br>
- .byte 62 ## DW_AT_encoding<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 11 ## DW_AT_byte_size<br>
- .byte 11 ## DW_FORM_data1<br>
- .byte 0 ## EOM(1)<br>
- .byte 0 ## EOM(2)<br>
- .byte 0 ## EOM(3)<br>
- .section __DWARF,__debug_info,regular,debug<br>
-Lsection_info:<br>
-Lcu_begin0:<br>
- .long 111 ## Length of Unit<br>
- .short 4 ## DWARF version number<br>
-Lset0 = Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section<br>
- .long Lset0<br>
- .byte 8 ## Address Size (in bytes)<br>
- .byte 1 ## Abbrev [1] 0xb:0x68 DW_TAG_compile_unit<br>
- .long 0 ## DW_AT_producer<br>
- .short 4 ## DW_AT_language<br>
- .long 55 ## DW_AT_name<br>
-Lset1 = Lline_table_start0-Lsection_line ## DW_AT_stmt_list<br>
- .long Lset1<br>
- .long 77 ## DW_AT_comp_dir<br>
- .quad Lfunc_begin0 ## DW_AT_low_pc<br>
-Lset2 = Lfunc_end0-Lfunc_begin0 ## DW_AT_high_pc<br>
- .long Lset2<br>
- .byte 2 ## Abbrev [2] 0x2a:0x2c DW_TAG_subprogram<br>
- .quad Lfunc_begin0 ## DW_AT_low_pc<br>
-Lset3 = Lfunc_end0-Lfunc_begin0 ## DW_AT_high_pc<br>
- .long Lset3<br>
- .byte 1 ## DW_AT_frame_base<br>
- .byte 86<br>
- .long 93 ## DW_AT_linkage_name<br>
- .long 90 ## DW_AT_name<br>
- .byte 1 ## DW_AT_decl_file<br>
- .byte 5 ## DW_AT_decl_line<br>
- .long 86 ## DW_AT_type<br>
- ## DW_AT_external<br>
- .byte 3 ## Abbrev [3] 0x47:0xe DW_TAG_formal_parameter<br>
- .byte 2 ## DW_AT_location<br>
- .byte 145<br>
- .byte 116<br>
- .long 107 ## DW_AT_name<br>
- .byte 1 ## DW_AT_decl_file<br>
- .byte 5 ## DW_AT_decl_line<br>
- .long 107 ## DW_AT_type<br>
- .byte 0 ## End Of Children Mark<br>
- .byte 4 ## Abbrev [4] 0x56:0x15 DW_TAG_structure_type<br>
- .long 100 ## DW_AT_name<br>
- .byte 4 ## DW_AT_byte_size<br>
- .byte 1 ## DW_AT_decl_file<br>
- .byte 1 ## DW_AT_decl_line<br>
- .byte 5 ## Abbrev [5] 0x5e:0xc DW_TAG_member<br>
- .long 107 ## DW_AT_name<br>
- .long 107 ## DW_AT_type<br>
- .byte 1 ## DW_AT_decl_file<br>
- .byte 2 ## DW_AT_decl_line<br>
- .byte 0 ## DW_AT_data_member_location<br>
- .byte 0 ## End Of Children Mark<br>
- .byte 6 ## Abbrev [6] 0x6b:0x7 DW_TAG_base_type<br>
- .long 109 ## DW_AT_name<br>
- .byte 5 ## DW_AT_encoding<br>
- .byte 4 ## DW_AT_byte_size<br>
- .byte 0 ## End Of Children Mark<br>
- .section __DWARF,__debug_ranges,regular,debug<br>
-Ldebug_range:<br>
- .section __DWARF,__debug_macinfo,regular,debug<br>
-Ldebug_macinfo:<br>
-Lcu_macro_begin0:<br>
- .byte 0 ## End Of Macro List Mark<br>
- .section __DWARF,__apple_names,regular,debug<br>
-Lnames_begin:<br>
- .long 1212240712 ## Header Magic<br>
- .short 1 ## Header Version<br>
- .short 0 ## Header Hash Function<br>
- .long 2 ## Header Bucket Count<br>
- .long 2 ## Header Hash Count<br>
- .long 12 ## Header Data Length<br>
- .long 0 ## HeaderData Die Offset Base<br>
- .long 1 ## HeaderData Atom Count<br>
- .short 1 ## DW_ATOM_die_offset<br>
- .short 6 ## DW_FORM_data4<br>
- .long -1 ## Bucket 0<br>
- .long 0 ## Bucket 1<br>
- .long 5862329 ## Hash in Bucket 1<br>
- .long -336438995 ## Hash in Bucket 1<br>
- .long LNames0-Lnames_begin ## Offset in Bucket 1<br>
- .long LNames1-Lnames_begin ## Offset in Bucket 1<br>
-LNames0:<br>
- .long 90 ## Fn<br>
- .long 1 ## Num DIEs<br>
- .long 42<br>
- .long 0<br>
-LNames1:<br>
- .long 93 ## _Z2Fni<br>
- .long 1 ## Num DIEs<br>
- .long 42<br>
- .long 0<br>
- .section __DWARF,__apple_objc,regular,debug<br>
-Lobjc_begin:<br>
- .long 1212240712 ## Header Magic<br>
- .short 1 ## Header Version<br>
- .short 0 ## Header Hash Function<br>
- .long 1 ## Header Bucket Count<br>
- .long 0 ## Header Hash Count<br>
- .long 12 ## Header Data Length<br>
- .long 0 ## HeaderData Die Offset Base<br>
- .long 1 ## HeaderData Atom Count<br>
- .short 1 ## DW_ATOM_die_offset<br>
- .short 6 ## DW_FORM_data4<br>
- .long -1 ## Bucket 0<br>
- .section __DWARF,__apple_namespac,regular,debug<br>
-Lnamespac_begin:<br>
- .long 1212240712 ## Header Magic<br>
- .short 1 ## Header Version<br>
- .short 0 ## Header Hash Function<br>
- .long 1 ## Header Bucket Count<br>
- .long 0 ## Header Hash Count<br>
- .long 12 ## Header Data Length<br>
- .long 0 ## HeaderData Die Offset Base<br>
- .long 1 ## HeaderData Atom Count<br>
- .short 1 ## DW_ATOM_die_offset<br>
- .short 6 ## DW_FORM_data4<br>
- .long -1 ## Bucket 0<br>
- .section __DWARF,__apple_types,regular,debug<br>
-Ltypes_begin:<br>
- .long 1212240712 ## Header Magic<br>
- .short 1 ## Header Version<br>
- .short 0 ## Header Hash Function<br>
- .long 2 ## Header Bucket Count<br>
- .long 2 ## Header Hash Count<br>
- .long 20 ## Header Data Length<br>
- .long 0 ## HeaderData Die Offset Base<br>
- .long 3 ## HeaderData Atom Count<br>
- .short 1 ## DW_ATOM_die_offset<br>
- .short 6 ## DW_FORM_data4<br>
- .short 3 ## DW_ATOM_die_tag<br>
- .short 5 ## DW_FORM_data2<br>
- .short 4 ## DW_ATOM_type_flags<br>
- .short 11 ## DW_FORM_data1<br>
- .long 0 ## Bucket 0<br>
- .long -1 ## Bucket 1<br>
- .long 193495088 ## Hash in Bucket 0<br>
- .long -772878966 ## Hash in Bucket 0<br>
- .long Ltypes1-Ltypes_begin ## Offset in Bucket 0<br>
- .long Ltypes0-Ltypes_begin ## Offset in Bucket 0<br>
-Ltypes1:<br>
- .long 109 ## int<br>
- .long 1 ## Num DIEs<br>
- .long 107<br>
- .short 36<br>
- .byte 0<br>
- .long 0<br>
-Ltypes0:<br>
- .long 100 ## Struct<br>
- .long 1 ## Num DIEs<br>
- .long 86<br>
- .short 19<br>
- .byte 0<br>
- .long 0<br>
-<br>
-.subsections_via_symbols<br>
- .section __DWARF,__debug_line,regular,debug<br>
-Lsection_line:<br>
-Lline_table_start0:<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>