[lld] r349697 - Simplify. NFC.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Wed Dec 19 15:25:02 2018
New Revision: 349697

URL: http://llvm.org/viewvc/llvm-project?rev=349697&view=rev
Log:
Simplify. NFC.

Differential Revision: https://reviews.llvm.org/D55903

Modified:
    lld/trunk/ELF/SymbolTable.cpp

Modified: lld/trunk/ELF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=349697&r1=349696&r2=349697&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.cpp (original)
+++ lld/trunk/ELF/SymbolTable.cpp Wed Dec 19 15:25:02 2018
@@ -494,18 +494,23 @@ void SymbolTable::addShared(StringRef Na
 
   // An undefined symbol with non default visibility must be satisfied
   // in the same DSO.
-  if (WasInserted ||
-      ((S->isUndefined() || S->isLazy()) && S->Visibility == STV_DEFAULT)) {
+  if (WasInserted) {
+    replaceSymbol<SharedSymbol>(S, File, Name, Sym.getBinding(), Sym.st_other,
+                                Sym.getType(), Sym.st_value, Sym.st_size,
+                                Alignment, VerdefIndex);
+    return;
+  }
+
+  if ((S->isUndefined() || S->isLazy()) && S->Visibility == STV_DEFAULT) {
     uint8_t Binding = S->Binding;
     bool WasUndefined = S->isUndefined();
     replaceSymbol<SharedSymbol>(S, File, Name, Sym.getBinding(), Sym.st_other,
                                 Sym.getType(), Sym.st_value, Sym.st_size,
                                 Alignment, VerdefIndex);
-    if (!WasInserted) {
-      S->Binding = Binding;
-      if (!S->isWeak() && !Config->GcSections && WasUndefined)
-        File.IsNeeded = true;
-    }
+
+    S->Binding = Binding;
+    if (!S->isWeak() && !Config->GcSections && WasUndefined)
+      File.IsNeeded = true;
   }
 }