[lld] r361350 - Simplify the logic to instantiate Symbols. Should be NFC.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Tue May 21 21:56:25 2019
New Revision: 361350

URL: http://llvm.org/viewvc/llvm-project?rev=361350&view=rev
Log:
Simplify the logic to instantiate Symbols. Should be NFC.

Modified:
    lld/trunk/ELF/InputFiles.cpp

Modified: lld/trunk/ELF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=361350&r1=361349&r2=361350&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.cpp (original)
+++ lld/trunk/ELF/InputFiles.cpp Tue May 21 21:56:25 2019
@@ -949,10 +949,10 @@ template <class ELFT> Symbol *ObjFile<EL
 
   StringRef Name = CHECK(Sym->getName(this->StringTable), this);
 
-  switch (Sym->st_shndx) {
-  case SHN_UNDEF:
+  if (Sym->st_shndx == SHN_UNDEF || Sec == &InputSection::Discarded)
     return Symtab->addSymbol(Undefined{this, Name, Binding, StOther, Type});
-  case SHN_COMMON:
+
+  if (Sym->st_shndx == SHN_COMMON) {
     if (Value == 0 || Value >= UINT32_MAX)
       fatal(toString(this) + ": common symbol '" + Name +
             "' has invalid alignment: " + Twine(Value));
@@ -966,8 +966,6 @@ template <class ELFT> Symbol *ObjFile<EL
   case STB_GLOBAL:
   case STB_WEAK:
   case STB_GNU_UNIQUE:
-    if (Sec == &InputSection::Discarded)
-      return Symtab->addSymbol(Undefined{this, Name, Binding, StOther, Type});
     return Symtab->addSymbol(
         Defined{this, Name, Binding, StOther, Type, Value, Size, Sec});
   }