<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Mar 25, 2019 at 2:14 PM Eric Christopher 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">On Mon, Mar 25, 2019 at 2:04 PM Ali Tamur via llvm-commits<br>
<<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br>
><br>
> Author: tamur<br>
> Date: Mon Mar 25 14:06:02 2019<br>
> New Revision: 356949<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=356949&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=356949&view=rev</a><br>
> Log:<br>
> Revert "[lld] Prevent duplicate files in debug line header in dwarf 5."<br>
><br>
> This reverts commit 5aa7478a55fa86dae45913b82bd05ed32d9c0973.<br>
><br>
<br>
In the future please try to use the svn revision of the actual commit<br>
rather than a git hash (until we move to git of course). There's<br>
git-svn-revert in the tools directory to make this easier.<br>
<br>
Thanks!<br></blockquote><div><br>+1<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
> Some things are broken; I will fix and try to commit again.<br></blockquote><div><br>Also it can be helpful to be more specific about what's broken (quote a buildbot failure log (& link to the buildbot), or describe the local failure you're seeing/someone reported, etc) - that way if someone else is tracking down a local failure, they can have an idea whether or not this revert will address the issue they're looking at, or if the patch isn't recommitted for any reason, and someone else decides to make a similar change in the future, they can potentially learn from whatever went wrong in this case.<br><br>Thanks!<br>- Dave<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
><br>
> Modified:<br>
>     lld/trunk/test/ELF/debug-line-obj.s<br>
>     lld/trunk/test/ELF/debug-line-str.s<br>
><br>
> Modified: lld/trunk/test/ELF/debug-line-obj.s<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/debug-line-obj.s?rev=356949&r1=356948&r2=356949&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/debug-line-obj.s?rev=356949&r1=356948&r2=356949&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/test/ELF/debug-line-obj.s (original)<br>
> +++ lld/trunk/test/ELF/debug-line-obj.s Mon Mar 25 14:06:02 2019<br>
> @@ -32,10 +32,11 @@<br>
>  _Z3barv:<br>
>  .Lfunc_begin0:<br>
>    .file  0 "/path" "test.cpp" md5 0x9ff11a8404ab4d032ee2dd4f5f8c4140<br>
> -  .loc  0 2 0                   # test.cpp:2:0<br>
> -  .loc  0 2 20 prologue_end     # test.cpp:2:20<br>
> +  .file  1 "test.cpp" md5 0x9ff11a8404ab4d032ee2dd4f5f8c4140<br>
> +  .loc  1 2 0                   # test.cpp:2:0<br>
> +  .loc  1 2 20 prologue_end     # test.cpp:2:20<br>
>    callq  _Z3foov<br>
> -  .loc  0 2 13 is_stmt 0        # test.cpp:2:13<br>
> +  .loc  1 2 13 is_stmt 0        # test.cpp:2:13<br>
>  .Lfunc_end0:<br>
>  .size  _Z3barv, .Lfunc_end0-_Z3barv<br>
>                                          # -- End function<br>
> @@ -44,10 +45,10 @@ _Z3barv:<br>
>    .type  _Z3bazv,@function<br>
>  _Z3bazv:                                # @_Z3bazv<br>
>  .Lfunc_begin1:<br>
> -  .loc  0 3 0 is_stmt 1         # test.cpp:3:0<br>
> -  .loc  0 3 20 prologue_end     # test.cpp:3:20<br>
> +  .loc  1 3 0 is_stmt 1         # test.cpp:3:0<br>
> +  .loc  1 3 20 prologue_end     # test.cpp:3:20<br>
>    callq  _Z3foov<br>
> -  .loc  0 3 13 is_stmt 0        # test.cpp:3:13<br>
> +  .loc  1 3 13 is_stmt 0        # test.cpp:3:13<br>
>  .Lfunc_end1:<br>
>    .size  _Z3bazv, .Lfunc_end1-_Z3bazv<br>
><br>
><br>
> Modified: lld/trunk/test/ELF/debug-line-str.s<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/debug-line-str.s?rev=356949&r1=356948&r2=356949&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/debug-line-str.s?rev=356949&r1=356948&r2=356949&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/test/ELF/debug-line-str.s (original)<br>
> +++ lld/trunk/test/ELF/debug-line-str.s Mon Mar 25 14:06:02 2019<br>
> @@ -27,7 +27,8 @@<br>
>  main:<br>
>  .Lfunc_begin0:<br>
>   .file 0 "/home/path" "test.cpp" md5 0x8ed32099ab837bd13543fd3e8102739f<br>
> - .loc 0 3 10 prologue_end<br>
> + .file 1 "test.cpp" md5 0x8ed32099ab837bd13543fd3e8102739f<br>
> + .loc 1 3 10 prologue_end<br>
>   jmp _Z3foov<br>
>  .Lfunc_end0:<br>
><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="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><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="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div>