[lld] r357020 - [lld] Reapply "Prevent duplicate files in debug line header in dwarf 5."

[Ali Tamur via llvm-commits]

Author: tamur
Date: Tue Mar 26 11:59:52 2019
New Revision: 357020

URL: http://llvm.org/viewvc/llvm-project?rev=357020&view=rev
Log:
[lld] Reapply "Prevent duplicate files in debug line header in dwarf 5."

Reapply rL356943; the previous attempt was reverted because the patch rL356941
that this depended on had broken a test.

Original commit message:

[lld] Prevent duplicate files in debug line header in dwarf 5.

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D59671

Modified:
    lld/trunk/test/ELF/debug-line-obj.s
    lld/trunk/test/ELF/debug-line-str.s

Modified: lld/trunk/test/ELF/debug-line-obj.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/debug-line-obj.s?rev=357020&r1=357019&r2=357020&view=diff
==============================================================================
--- lld/trunk/test/ELF/debug-line-obj.s (original)
+++ lld/trunk/test/ELF/debug-line-obj.s Tue Mar 26 11:59:52 2019
@@ -32,11 +32,10 @@
 _Z3barv:
 .Lfunc_begin0:
   .file  0 "/path" "test.cpp" md5 0x9ff11a8404ab4d032ee2dd4f5f8c4140
-  .file  1 "test.cpp" md5 0x9ff11a8404ab4d032ee2dd4f5f8c4140
-  .loc  1 2 0                   # test.cpp:2:0
-  .loc  1 2 20 prologue_end     # test.cpp:2:20
+  .loc  0 2 0                   # test.cpp:2:0
+  .loc  0 2 20 prologue_end     # test.cpp:2:20
   callq  _Z3foov
-  .loc  1 2 13 is_stmt 0        # test.cpp:2:13
+  .loc  0 2 13 is_stmt 0        # test.cpp:2:13
 .Lfunc_end0:
 .size  _Z3barv, .Lfunc_end0-_Z3barv
                                         # -- End function
@@ -45,10 +44,10 @@ _Z3barv:
   .type  _Z3bazv, at function
 _Z3bazv:                                # @_Z3bazv
 .Lfunc_begin1:
-  .loc  1 3 0 is_stmt 1         # test.cpp:3:0
-  .loc  1 3 20 prologue_end     # test.cpp:3:20
+  .loc  0 3 0 is_stmt 1         # test.cpp:3:0
+  .loc  0 3 20 prologue_end     # test.cpp:3:20
   callq  _Z3foov
-  .loc  1 3 13 is_stmt 0        # test.cpp:3:13
+  .loc  0 3 13 is_stmt 0        # test.cpp:3:13
 .Lfunc_end1:
   .size  _Z3bazv, .Lfunc_end1-_Z3bazv
 

Modified: lld/trunk/test/ELF/debug-line-str.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/debug-line-str.s?rev=357020&r1=357019&r2=357020&view=diff
==============================================================================
--- lld/trunk/test/ELF/debug-line-str.s (original)
+++ lld/trunk/test/ELF/debug-line-str.s Tue Mar 26 11:59:52 2019
@@ -27,8 +27,7 @@
 main:
 .Lfunc_begin0:
  .file 0 "/home/path" "test.cpp" md5 0x8ed32099ab837bd13543fd3e8102739f
- .file 1 "test.cpp" md5 0x8ed32099ab837bd13543fd3e8102739f
- .loc 1 3 10 prologue_end
+ .loc 0 3 10 prologue_end
  jmp _Z3foov
 .Lfunc_end0: