From e3a6062844c599327856dd0a4bd0195d27ad7261 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Sat, 3 Mar 2018 02:13:50 +0000
Subject: [PATCH] Simplify. NFC.

Since r321982 we don't set VersionId in scanShlibUndefined, which
makes InVersionScript redundant.

llvm-svn: 326641
---
 lld/ELF/SymbolTable.cpp | 4 +---
 lld/ELF/Symbols.h       | 4 ----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp
index 358f7b699f97..9ef89a702143 100644
--- a/lld/ELF/SymbolTable.cpp
+++ b/lld/ELF/SymbolTable.cpp
@@ -235,7 +235,6 @@ std::pair<Symbol *, bool> SymbolTable::insert(StringRef Name) {
   Symbol *Sym;
   if (IsNew) {
     Sym = reinterpret_cast<Symbol *>(make<SymbolUnion>());
-    Sym->InVersionScript = false;
     Sym->Visibility = STV_DEFAULT;
     Sym->IsUsedInRegularObj = false;
     Sym->ExportDynamic = false;
@@ -698,10 +697,9 @@ void SymbolTable::assignExactVersion(SymbolVersion Ver, uint16_t VersionId,
     if (Sym->getName().contains('@'))
       continue;
 
-    if (Sym->InVersionScript)
+    if (Sym->VersionId != Config->DefaultSymbolVersion)
       warn("duplicate symbol '" + Ver.Name + "' in version script");
     Sym->VersionId = VersionId;
-    Sym->InVersionScript = true;
   }
 }
 
diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h
index a437ab61bf0b..bef5897b131f 100644
--- a/lld/ELF/Symbols.h
+++ b/lld/ELF/Symbols.h
@@ -80,9 +80,6 @@ public:
   // True if this symbol is specified by --trace-symbol option.
   unsigned Traced : 1;
 
-  // This symbol version was found in a version script.
-  unsigned InVersionScript : 1;
-
   // The file from which this symbol was created.
   InputFile *File;
 
@@ -368,7 +365,6 @@ void replaceSymbol(Symbol *S, ArgT &&... Arg) {
   S->ExportDynamic = Sym.ExportDynamic;
   S->CanInline = Sym.CanInline;
   S->Traced = Sym.Traced;
-  S->InVersionScript = Sym.InVersionScript;
 
   // Print out a log message if --trace-symbol was specified.
   // This is for debugging.