<div dir="ltr">Best to include the Subversion revision number rather than a git hash (& there's a utility in the llvm source tree: util/gt-svn/git-svnrevert).<br></div><br><div class="gmail_quote"><div dir="ltr">On Fri, Nov 3, 2017 at 3:23 PM Bob Haarman 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: inglorion<br>
Date: Fri Nov 3 15:23:19 2017<br>
New Revision: 317378<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=317378&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=317378&view=rev</a><br>
Log:<br>
Revert "[ELF] - Teach LLD to use information from .debug_str for error reporting."<br>
<br>
This reverts commit 00b7acb8f6c8a4663bb7c8396d217c210209b562.<br>
<br>
It was causing some links to execute llvm_unreachable.<br>
<br>
Removed:<br>
lld/trunk/test/ELF/conflict-debug-variable2.s<br>
Modified:<br>
lld/trunk/ELF/GdbIndex.cpp<br>
lld/trunk/ELF/GdbIndex.h<br>
<br>
Modified: lld/trunk/ELF/GdbIndex.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/GdbIndex.cpp?rev=317378&r1=317377&r2=317378&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/GdbIndex.cpp?rev=317378&r1=317377&r2=317378&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/GdbIndex.cpp (original)<br>
+++ lld/trunk/ELF/GdbIndex.cpp Fri Nov 3 15:23:19 2017<br>
@@ -44,8 +44,6 @@ template <class ELFT> LLDDwarfObj<ELFT>:<br>
GnuPubNamesSection = toStringRef(Sec->Data);<br>
else if (Sec->Name == ".debug_gnu_pubtypes")<br>
GnuPubTypesSection = toStringRef(Sec->Data);<br>
- else if (Sec->Name == ".debug_str")<br>
- StrSection = toStringRef(Sec->Data);<br>
}<br>
}<br>
<br>
<br>
Modified: lld/trunk/ELF/GdbIndex.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/GdbIndex.h?rev=317378&r1=317377&r2=317378&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/GdbIndex.h?rev=317378&r1=317377&r2=317378&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/GdbIndex.h (original)<br>
+++ lld/trunk/ELF/GdbIndex.h Fri Nov 3 15:23:19 2017<br>
@@ -30,7 +30,6 @@ template <class ELFT> class LLDDwarfObj<br>
StringRef AbbrevSection;<br>
StringRef GnuPubNamesSection;<br>
StringRef GnuPubTypesSection;<br>
- StringRef StrSection;<br>
<br>
template <class RelTy><br>
llvm::Optional<llvm::RelocAddrEntry> findAux(const InputSectionBase &Sec,<br>
@@ -50,7 +49,7 @@ public:<br>
}<br>
StringRef getCUIndexSection() const override { return ""; }<br>
StringRef getAbbrevSection() const override { return AbbrevSection; }<br>
- StringRef getStringSection() const override { return StrSection; }<br>
+ StringRef getStringSection() const override { return ""; }<br>
StringRef getGnuPubNamesSection() const override {<br>
return GnuPubNamesSection;<br>
}<br>
<br>
Removed: lld/trunk/test/ELF/conflict-debug-variable2.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/conflict-debug-variable2.s?rev=317377&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/conflict-debug-variable2.s?rev=317377&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/conflict-debug-variable2.s (original)<br>
+++ lld/trunk/test/ELF/conflict-debug-variable2.s (removed)<br>
@@ -1,160 +0,0 @@<br>
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o<br>
-<br>
-# RUN: llvm-dwarfdump -v %t.o | FileCheck -check-prefix=INPUT %s<br>
-# INPUT: .debug_info contents:<br>
-# INPUT: DW_TAG_variable<br>
-# INPUT-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000027] = "foo")<br>
-# INPUT-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0033 => {0x00000033} "int")<br>
-# INPUT-NEXT: DW_AT_external [DW_FORM_flag_present] (true)<br>
-# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home/path/test.c")<br>
-# INPUT-NEXT: DW_AT_decl_line [DW_FORM_data1] (1)<br>
-# INPUT-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addr 0x0)<br>
-# INPUT: DW_TAG_variable<br>
-# INPUT-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000002f] = "bar")<br>
-# INPUT-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0033 => {0x00000033} "int")<br>
-# INPUT-NEXT: DW_AT_external [DW_FORM_flag_present] (true)<br>
-# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home/path/test.c")<br>
-# INPUT-NEXT: DW_AT_decl_line [DW_FORM_data1] (2)<br>
-# INPUT-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addr 0x0)<br>
-<br>
-## Check we use information from .debug_info in messages.<br>
-# RUN: not ld.lld %t.o %t.o -o %t 2>&1 | FileCheck %s<br>
-# CHECK: duplicate symbol: bar<br>
-# CHECK-NEXT: >>> defined at test.c:2<br>
-# CHECK-NEXT: >>> {{.*}}:(bar)<br>
-# CHECK-NEXT: >>> defined at test.c:2<br>
-# CHECK-NEXT: >>> {{.*}}:(.data+0x0)<br>
-# CHECK: duplicate symbol: foo<br>
-# CHECK-NEXT: >>> defined at test.c:1<br>
-# CHECK-NEXT: >>> {{.*}}:(foo)<br>
-# CHECK-NEXT: >>> defined at test.c:1<br>
-# CHECK-NEXT: >>> {{.*}}:(.bss+0x0)<br>
-<br>
-# Used reduced output from following code and clang<br>
-# version 6.0.0 (trunk 316661) to produce this input file:<br>
-# Source (test.c):<br>
-# int foo = 0;<br>
-# int bar = 1;<br>
-# Invocation: clang -g -S test.c<br>
-<br>
-.text<br>
-.file "test.c"<br>
-.file 1 "test.c"<br>
-<br>
-.type foo,@object<br>
-.bss<br>
-.globl foo<br>
-.p2align 2<br>
-foo:<br>
- .long 0<br>
- .size foo, 4<br>
-<br>
-.type bar,@object<br>
-.data<br>
-.globl bar<br>
-.p2align 2<br>
-bar:<br>
- .long 1<br>
- .size bar, 4<br>
-<br>
-.section .debug_str,"MS",@progbits,1<br>
-.Linfo_string0:<br>
- .asciz "clang version 6.0.0"<br>
-.Linfo_string1:<br>
- .asciz "test.c"<br>
-.Linfo_string2:<br>
- .asciz "/home/path/"<br>
-.Linfo_string3:<br>
- .asciz "foo"<br>
-.Linfo_string4:<br>
- .asciz "int"<br>
-.Linfo_string5:<br>
- .asciz "bar"<br>
-<br>
-.section .debug_abbrev,"",@progbits<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>
- .ascii "\264B" # DW_AT_GNU_pubnames<br>
- .byte 25 # DW_FORM_flag_present<br>
- .byte 0 # EOM(1)<br>
- .byte 0 # EOM(2)<br>
-<br>
- .byte 2 # Abbreviation Code<br>
- .byte 52 # DW_TAG_variable<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 63 # DW_AT_external<br>
- .byte 25 # DW_FORM_flag_present<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 2 # DW_AT_location<br>
- .byte 24 # DW_FORM_exprloc<br>
- .byte 0 # EOM(1)<br>
- .byte 0 # EOM(2)<br>
-<br>
- .byte 3 # 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>
-<br>
-.section .debug_info,"",@progbits<br>
-.Lcu_begin0:<br>
- .long 76 # Length of Unit<br>
- .short 4 # DWARF version number<br>
- .long .debug_abbrev # Offset Into Abbrev. Section<br>
- .byte 8 # Address Size (in bytes)<br>
-<br>
- .byte 1 # Abbrev [1] 0xb:0x45 DW_TAG_compile_unit<br>
- .long .Linfo_string0 # DW_AT_producer<br>
- .short 12 # DW_AT_language<br>
- .long .Linfo_string1 # DW_AT_name<br>
- .long 0 # DW_AT_stmt_list<br>
- .long .Linfo_string2 # DW_AT_comp_dir<br>
-<br>
- .byte 2 # Abbrev [2] 0x1e:0x15 DW_TAG_variable<br>
- .long .Linfo_string3 # DW_AT_name<br>
- .long 51 # DW_AT_type<br>
- .byte 1 # DW_AT_decl_file<br>
- .byte 1 # DW_AT_decl_line<br>
- .byte 9 # DW_AT_location<br>
- .byte 3<br>
- .quad foo<br>
-<br>
- .byte 3 # Abbrev [3] 0x33:0x7 DW_TAG_base_type<br>
- .long .Linfo_string4 # DW_AT_name<br>
- .byte 5 # DW_AT_encoding<br>
- .byte 4 # DW_AT_byte_size<br>
-<br>
- .byte 2 # Abbrev [2] 0x3a:0x15 DW_TAG_variable<br>
- .long .Linfo_string5 # DW_AT_name<br>
- .long 51 # DW_AT_type<br>
- .byte 1 # DW_AT_decl_file<br>
- .byte 2 # DW_AT_decl_line<br>
- .byte 9 # DW_AT_location<br>
- .byte 3<br>
- .quad bar<br>
- .byte 0 # End Of Children Mark<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>