<div dir="ltr">You can now remove getFirstELF function.</div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Oct 11, 2015 at 1:19 PM, Rafael Espindola via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</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: Sun Oct 11 15:19:20 2015<br>
New Revision: 249996<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=249996&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=249996&view=rev</a><br>
Log:<br>
Handle a crash in conflict detection with archive members.<br>
<br>
Added:<br>
    lld/trunk/test/elf2/incompatible-ar-first.s<br>
Modified:<br>
    lld/trunk/ELF/Config.h<br>
    lld/trunk/ELF/InputFiles.h<br>
    lld/trunk/ELF/SymbolTable.cpp<br>
<br>
Modified: lld/trunk/ELF/Config.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Config.h?rev=249996&r1=249995&r2=249996&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Config.h?rev=249996&r1=249995&r2=249996&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Config.h (original)<br>
+++ lld/trunk/ELF/Config.h Sun Oct 11 15:19:20 2015<br>
@@ -18,6 +18,7 @@<br>
 namespace lld {<br>
 namespace elf2 {<br>
<br>
+class ELFFileBase;<br>
 class SymbolBody;<br>
<br>
 enum ELFKind {<br>
@@ -30,6 +31,7 @@ enum ELFKind {<br>
<br>
 struct Configuration {<br>
   SymbolBody *EntrySym = nullptr;<br>
+  ELFFileBase *FirstElf = nullptr;<br>
   llvm::StringRef DynamicLinker;<br>
   llvm::StringRef Entry;<br>
   llvm::StringRef Emulation;<br>
<br>
Modified: lld/trunk/ELF/InputFiles.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.h?rev=249996&r1=249995&r2=249996&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.h?rev=249996&r1=249995&r2=249996&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/InputFiles.h (original)<br>
+++ lld/trunk/ELF/InputFiles.h Sun Oct 11 15:19:20 2015<br>
@@ -249,6 +249,9 @@ std::unique_ptr<ELFFileBase> createELFFi<br>
     error("Invalid file class: " + MB.getBufferIdentifier());<br>
   }<br>
<br>
+  if (!Config->FirstElf)<br>
+    Config->FirstElf = Ret.get();<br>
+<br>
   if (Config->ElfKind == ELFNoneKind) {<br>
     Config->ElfKind = Ret->getELFKind();<br>
     Config->EMachine = Ret->getEMachine();<br>
<br>
Modified: lld/trunk/ELF/SymbolTable.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=249996&r1=249995&r2=249996&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=249996&r1=249995&r2=249996&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/SymbolTable.cpp (original)<br>
+++ lld/trunk/ELF/SymbolTable.cpp Sun Oct 11 15:19:20 2015<br>
@@ -35,7 +35,7 @@ void SymbolTable<ELFT>::addFile(std::uni<br>
       StringRef A = E->getName();<br>
       StringRef B = Config->Emulation;<br>
       if (B.empty())<br>
-        B = getFirstELF()->getName();<br>
+        B = Config->FirstElf->getName();<br>
       error(A + " is incompatible with " + B);<br>
     }<br>
   }<br>
<br>
Added: lld/trunk/test/elf2/incompatible-ar-first.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/incompatible-ar-first.s?rev=249996&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/incompatible-ar-first.s?rev=249996&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/incompatible-ar-first.s (added)<br>
+++ lld/trunk/test/elf2/incompatible-ar-first.s Sun Oct 11 15:19:20 2015<br>
@@ -0,0 +1,11 @@<br>
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/archive.s -o %ta.o<br>
+// RUN: llvm-ar rc %t.a %ta.o<br>
+// RUN: llvm-mc -filetype=obj -triple=i686-linux %s -o %tb.o<br>
+// RUN: not ld.lld2 %t.a %tb.o 2>&1 | FileCheck %s<br>
+<br>
+// We used to crash when<br>
+// * The first object seen by the symbol table is from an archive.<br>
+// * -m was not used.<br>
+// CHECK: a.o is incompatible with {{.*}}b.o<br>
+<br>
+// REQUIRES: x86<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>