<div dir="ltr">For which change?<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, May 26, 2016 at 1:31 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: Thu May 26 15:31:06 2016<br>
New Revision: 270907<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=270907&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=270907&view=rev</a><br>
Log:<br>
Update for llvm change.<br>
<br>
Modified:<br>
    lld/trunk/COFF/SymbolTable.cpp<br>
<br>
Modified: lld/trunk/COFF/SymbolTable.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/SymbolTable.cpp?rev=270907&r1=270906&r2=270907&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/SymbolTable.cpp?rev=270907&r1=270906&r2=270907&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/COFF/SymbolTable.cpp (original)<br>
+++ lld/trunk/COFF/SymbolTable.cpp Thu May 26 15:31:06 2016<br>
@@ -338,18 +338,22 @@ void SymbolTable::addCombinedLTOObject(O<br>
     // diagnose them later in reportRemainingUndefines().<br>
     StringRef Name = Body->getName();<br>
     Symbol *Sym = insert(Body);<br>
+    SymbolBody *Existing = Sym->Body;<br>
+<br>
+    if (Existing == Body)<br>
+      continue;<br>
<br>
-    if (isa<DefinedBitcode>(Sym->Body)) {<br>
+    if (isa<DefinedBitcode>(Existing)) {<br>
       Sym->Body = Body;<br>
       continue;<br>
     }<br>
-    if (auto *L = dyn_cast<Lazy>(Sym->Body)) {<br>
+    if (auto *L = dyn_cast<Lazy>(Existing)) {<br>
       // We may see new references to runtime library symbols such as __chkstk<br>
       // here. These symbols must be wholly defined in non-bitcode files.<br>
       addMemberFile(L);<br>
       continue;<br>
     }<br>
-    SymbolBody *Existing = Sym->Body;<br>
+<br>
     int Comp = Existing->compare(Body);<br>
     if (Comp == 0)<br>
       error(Twine("LTO: unexpected duplicate symbol: ") + Name);<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>