<div dir="ltr">Nice!</div><br><br><div class="gmail_quote"><div dir="ltr">On Fri, Mar 2, 2018 at 6:16 PM Rafael Espindola 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">Author: rafael<br>
Date: Fri Mar  2 18:13:50 2018<br>
New Revision: 326641<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=326641&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=326641&view=rev</a><br>
Log:<br>
Simplify. NFC.<br>
<br>
Since r321982 we don't set VersionId in scanShlibUndefined, which<br>
makes InVersionScript redundant.<br>
<br>
Modified:<br>
    lld/trunk/ELF/SymbolTable.cpp<br>
    lld/trunk/ELF/Symbols.h<br>
<br>
Modified: lld/trunk/ELF/SymbolTable.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=326641&r1=326640&r2=326641&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=326641&r1=326640&r2=326641&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/SymbolTable.cpp (original)<br>
+++ lld/trunk/ELF/SymbolTable.cpp Fri Mar  2 18:13:50 2018<br>
@@ -235,7 +235,6 @@ std::pair<Symbol *, bool> SymbolTable::i<br>
   Symbol *Sym;<br>
   if (IsNew) {<br>
     Sym = reinterpret_cast<Symbol *>(make<SymbolUnion>());<br>
-    Sym->InVersionScript = false;<br>
     Sym->Visibility = STV_DEFAULT;<br>
     Sym->IsUsedInRegularObj = false;<br>
     Sym->ExportDynamic = false;<br>
@@ -698,10 +697,9 @@ void SymbolTable::assignExactVersion(Sym<br>
     if (Sym->getName().contains('@'))<br>
       continue;<br>
<br>
-    if (Sym->InVersionScript)<br>
+    if (Sym->VersionId != Config->DefaultSymbolVersion)<br>
       warn("duplicate symbol '" + Ver.Name + "' in version script");<br>
     Sym->VersionId = VersionId;<br>
-    Sym->InVersionScript = true;<br>
   }<br>
 }<br>
<br>
<br>
Modified: lld/trunk/ELF/Symbols.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=326641&r1=326640&r2=326641&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=326641&r1=326640&r2=326641&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Symbols.h (original)<br>
+++ lld/trunk/ELF/Symbols.h Fri Mar  2 18:13:50 2018<br>
@@ -80,9 +80,6 @@ public:<br>
   // True if this symbol is specified by --trace-symbol option.<br>
   unsigned Traced : 1;<br>
<br>
-  // This symbol version was found in a version script.<br>
-  unsigned InVersionScript : 1;<br>
-<br>
   // The file from which this symbol was created.<br>
   InputFile *File;<br>
<br>
@@ -368,7 +365,6 @@ void replaceSymbol(Symbol *S, ArgT &&...<br>
   S->ExportDynamic = Sym.ExportDynamic;<br>
   S->CanInline = Sym.CanInline;<br>
   S->Traced = Sym.Traced;<br>
-  S->InVersionScript = Sym.InVersionScript;<br>
<br>
   // Print out a log message if --trace-symbol was specified.<br>
   // This is for debugging.<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="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>