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

[Ali Tamur via llvm-commits]

Author: tamur
Date: Tue Mar 26 12:57:13 2019
New Revision: 357025

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

This reverts commit rL357020

Reason: rL357018, which this commit depend on breaks the test:
llvm/test/tools/llvm-objdump/embedded-source.test on some architectures.

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=357025&r1=357024&r2=357025&view=diff
==============================================================================
--- lld/trunk/test/ELF/debug-line-obj.s (original)
+++ lld/trunk/test/ELF/debug-line-obj.s Tue Mar 26 12:57:13 2019
@@ -32,10 +32,11 @@
 _Z3barv:
 .Lfunc_begin0:
   .file  0 "/path" "test.cpp" md5 0x9ff11a8404ab4d032ee2dd4f5f8c4140
-  .loc  0 2 0                   # test.cpp:2:0
-  .loc  0 2 20 prologue_end     # test.cpp:2:20
+  .file  1 "test.cpp" md5 0x9ff11a8404ab4d032ee2dd4f5f8c4140
+  .loc  1 2 0                   # test.cpp:2:0
+  .loc  1 2 20 prologue_end     # test.cpp:2:20
   callq  _Z3foov
-  .loc  0 2 13 is_stmt 0        # test.cpp:2:13
+  .loc  1 2 13 is_stmt 0        # test.cpp:2:13
 .Lfunc_end0:
 .size  _Z3barv, .Lfunc_end0-_Z3barv
                                         # -- End function
@@ -44,10 +45,10 @@ _Z3barv:
   .type  _Z3bazv, at function
 _Z3bazv:                                # @_Z3bazv
 .Lfunc_begin1:
-  .loc  0 3 0 is_stmt 1         # test.cpp:3:0
-  .loc  0 3 20 prologue_end     # test.cpp:3:20
+  .loc  1 3 0 is_stmt 1         # test.cpp:3:0
+  .loc  1 3 20 prologue_end     # test.cpp:3:20
   callq  _Z3foov
-  .loc  0 3 13 is_stmt 0        # test.cpp:3:13
+  .loc  1 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=357025&r1=357024&r2=357025&view=diff
==============================================================================
--- lld/trunk/test/ELF/debug-line-str.s (original)
+++ lld/trunk/test/ELF/debug-line-str.s Tue Mar 26 12:57:13 2019
@@ -27,7 +27,8 @@
 main:
 .Lfunc_begin0:
  .file 0 "/home/path" "test.cpp" md5 0x8ed32099ab837bd13543fd3e8102739f
- .loc 0 3 10 prologue_end
+ .file 1 "test.cpp" md5 0x8ed32099ab837bd13543fd3e8102739f
+ .loc 1 3 10 prologue_end
  jmp _Z3foov
 .Lfunc_end0: