From cea954802817b60e16f89044a9f3ba29cea3a443 Mon Sep 17 00:00:00 2001 From: Ali Tamur Date: Tue, 26 Mar 2019 19:57:13 +0000 Subject: [PATCH] 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. llvm-svn: 357025 --- lld/test/ELF/debug-line-obj.s | 13 +++++++------ lld/test/ELF/debug-line-str.s | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lld/test/ELF/debug-line-obj.s b/lld/test/ELF/debug-line-obj.s index 32182a1..615673b 100644 --- a/lld/test/ELF/debug-line-obj.s +++ b/lld/test/ELF/debug-line-obj.s @@ -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,@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 diff --git a/lld/test/ELF/debug-line-str.s b/lld/test/ELF/debug-line-str.s index af5eee4..e23b5c8 100644 --- a/lld/test/ELF/debug-line-str.s +++ b/lld/test/ELF/debug-line-str.s @@ -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: -- 2.7.4