<p dir="ltr">Yes, sorry about that.</p>
<div class="gmail_quote">On Jul 15, 2015 4:49 PM, "Alexey Samsonov" <<a href="mailto:vonosmas@gmail.com">vonosmas@gmail.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Ah, I see it already did. Sorry.</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jul 15, 2015 at 4:49 PM, Alexey Samsonov <span dir="ltr"><<a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Is this expected to fix recent failures<div><a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__lab.llvm.org-3A8011_builders_clang-2Dx86-5F64-2Ddebian-2Dfast_builds_28725_steps_check-2Dall_logs_FAIL-253A-2520LLVM-253A-253Amri-2Daddmod.test&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=QCaXy_hkgR2_S_Q-t1spAVm0N-HqMixokMjmLLaOE30&s=AMJjOZOzksQL6onQASprr83-AJOVEyc_eaXO2e-ZBdU&e=" target="_blank">http://lab.llvm.org:8011/builders/clang-x86_64-debian-fast/builds/28725/steps/check-all/logs/FAIL%3A%20LLVM%3A%3Amri-addmod.test</a><br></div><div>?</div></div><div class="gmail_extra"><div><div><br><div class="gmail_quote">On Wed, Jul 15, 2015 at 4:15 PM, Rafael Espindola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Wed Jul 15 18:15:33 2015<br>
New Revision: 242354<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D242354-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=QCaXy_hkgR2_S_Q-t1spAVm0N-HqMixokMjmLLaOE30&s=oFrAzNtL---c3rCAkFq0Q-Q7B9WJHblXW7loj8RjCNc&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=242354&view=rev</a><br>
Log:<br>
llvm-ar: Don't write the directory in the string table.<br>
<br>
We were already doing the right thing for short file names, but not long<br>
ones.<br>
<br>
Modified:<br>
llvm/trunk/lib/Object/ArchiveWriter.cpp<br>
llvm/trunk/test/Object/archive-format.test<br>
<br>
Modified: llvm/trunk/lib/Object/ArchiveWriter.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_lib_Object_ArchiveWriter.cpp-3Frev-3D242354-26r1-3D242353-26r2-3D242354-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=QCaXy_hkgR2_S_Q-t1spAVm0N-HqMixokMjmLLaOE30&s=r8f-4u0ybcY3CxnTq_PfLRAqC5KocCuIvwxR5BVBEP4&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/ArchiveWriter.cpp?rev=242354&r1=242353&r2=242354&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Object/ArchiveWriter.cpp (original)<br>
+++ llvm/trunk/lib/Object/ArchiveWriter.cpp Wed Jul 15 18:15:33 2015<br>
@@ -160,7 +160,7 @@ static void writeStringTable(raw_fd_ostr<br>
bool Thin) {<br>
unsigned StartOffset = 0;<br>
for (const NewArchiveIterator &I : Members) {<br>
- StringRef Name = I.getName();<br>
+ StringRef Name = sys::path::filename(I.getName());<br>
if (!useStringTable(Thin, Name))<br>
continue;<br>
if (StartOffset == 0) {<br>
<br>
Modified: llvm/trunk/test/Object/archive-format.test<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_test_Object_archive-2Dformat.test-3Frev-3D242354-26r1-3D242353-26r2-3D242354-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=QCaXy_hkgR2_S_Q-t1spAVm0N-HqMixokMjmLLaOE30&s=NQ2-obT3qidJX6YLCpDCiF7SdoQUScP1uAlSilABG4Q&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/archive-format.test?rev=242354&r1=242353&r2=242354&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Object/archive-format.test (original)<br>
+++ llvm/trunk/test/Object/archive-format.test Wed Jul 15 18:15:33 2015<br>
@@ -6,17 +6,26 @@ RUN: cd %t<br>
<br>
RUN: echo -n bar. > 0123456789abcde<br>
RUN: echo -n zed. > 0123456789abcdef<br>
+RUN: mkdir -p foo<br>
+RUN: echo -n bar2 > foo/0123456789abcde<br>
+RUN: echo -n zed2 > foo/0123456789abcdef<br>
<br>
RUN: rm -f %t.a<br>
-RUN: llvm-ar --format=gnu rc %t.a 0123456789abcde 0123456789abcdef<br>
+RUN: llvm-ar --format=gnu rc %t.a 0123456789abcde 0123456789abcdef foo/0123456789abcde foo/0123456789abcdef<br>
RUN: cat %t.a | FileCheck -strict-whitespace %s<br>
<br>
CHECK: !<arch><br>
-CHECK-NEXT: // 18 `<br>
+CHECK-NEXT: // 36 `<br>
+CHECK-NEXT: 0123456789abcdef/<br>
CHECK-NEXT: 0123456789abcdef/<br>
CHECK-NEXT: 0123456789abcde/0 0 0 644 4 `<br>
-CHECK-NEXT: bar./0 0 0 0 644 4 `<br>
+CHECK-NEXT: bar.<br>
+CHECK-SAME: /0 0 0 0 644 4 `<br>
CHECK-NEXT: zed.<br>
+CHECK-SAME: 0123456789abcde/0 0 0 644 4 `<br>
+CHECK-NEXT: bar2<br>
+CHECK-SAME: /18 0 0 0 644 4 `<br>
+CHECK-NEXT: zed2<br>
<br>
RUN: rm -f %t.a<br>
RUN: llvm-ar --format=bsd rc %t.a 0123456789abcde 0123456789abcdef<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div></div></div><span><font color="#888888">-- <br><div><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</font></span></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div>
</blockquote></div>