[lld] r280243 - Remove redundant argument. NFC.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Wed Aug 31 08:49:23 2016
New Revision: 280243

URL: http://llvm.org/viewvc/llvm-project?rev=280243&view=rev
Log:
Remove redundant argument. NFC.

Modified:
    lld/trunk/ELF/SymbolTable.cpp
    lld/trunk/ELF/SymbolTable.h

Modified: lld/trunk/ELF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=280243&r1=280242&r2=280243&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.cpp (original)
+++ lld/trunk/ELF/SymbolTable.cpp Wed Aug 31 08:49:23 2016
@@ -236,7 +236,8 @@ template <class ELFT>
 std::pair<Symbol *, bool>
 SymbolTable<ELFT>::insert(StringRef &Name, uint8_t Type, uint8_t Visibility,
                           bool CanOmitFromDynSym, bool HasUnnamedAddr,
-                          bool IsUsedInRegularObj, InputFile *File) {
+                          InputFile *File) {
+  bool IsUsedInRegularObj = !File || File->kind() == InputFile::ObjectKind;
   Symbol *S;
   bool WasInserted;
   std::tie(S, WasInserted) = insert(Name);
@@ -283,8 +284,7 @@ Symbol *SymbolTable<ELFT>::addUndefined(
   Symbol *S;
   bool WasInserted;
   std::tie(S, WasInserted) =
-      insert(Name, Type, StOther & 3, CanOmitFromDynSym, HasUnnamedAddr,
-             /*IsUsedInRegularObj*/ !File || !isa<BitcodeFile>(File), File);
+      insert(Name, Type, StOther & 3, CanOmitFromDynSym, HasUnnamedAddr, File);
   if (WasInserted) {
     S->Binding = Binding;
     replaceBody<Undefined>(S, Name, StOther, Type, File);
@@ -349,9 +349,8 @@ Symbol *SymbolTable<ELFT>::addCommon(Str
                                      bool HasUnnamedAddr, InputFile *File) {
   Symbol *S;
   bool WasInserted;
-  std::tie(S, WasInserted) =
-      insert(N, Type, StOther & 3, /*CanOmitFromDynSym*/ false, HasUnnamedAddr,
-             !isa<BitcodeFile>(File), File);
+  std::tie(S, WasInserted) = insert(
+      N, Type, StOther & 3, /*CanOmitFromDynSym*/ false, HasUnnamedAddr, File);
   int Cmp = compareDefined(S, WasInserted, Binding);
   if (Cmp > 0) {
     S->Binding = Binding;
@@ -390,10 +389,10 @@ Symbol *SymbolTable<ELFT>::addRegular(St
                                       InputSectionBase<ELFT> *Section) {
   Symbol *S;
   bool WasInserted;
-  std::tie(S, WasInserted) = insert(
-      Name, Sym.getType(), Sym.getVisibility(),
-      /*CanOmitFromDynSym*/ false, /*HasUnnamedAddr*/ false,
-      /*IsUsedInRegularObj*/ true, Section ? Section->getFile() : nullptr);
+  std::tie(S, WasInserted) =
+      insert(Name, Sym.getType(), Sym.getVisibility(),
+             /*CanOmitFromDynSym*/ false, /*HasUnnamedAddr*/ false,
+             Section ? Section->getFile() : nullptr);
   int Cmp = compareDefinedNonCommon(S, WasInserted, Sym.getBinding());
   if (Cmp > 0)
     replaceBody<DefinedRegular<ELFT>>(S, Name, Sym, Section);
@@ -409,7 +408,7 @@ Symbol *SymbolTable<ELFT>::addRegular(St
   bool WasInserted;
   std::tie(S, WasInserted) =
       insert(Name, STT_NOTYPE, StOther & 3, /*CanOmitFromDynSym*/ false,
-             /*HasUnnamedAddr*/ false, /*IsUsedInRegularObj*/ true, nullptr);
+             /*HasUnnamedAddr*/ false, nullptr);
   int Cmp = compareDefinedNonCommon(S, WasInserted, Binding);
   if (Cmp > 0)
     replaceBody<DefinedRegular<ELFT>>(S, Name, StOther);
@@ -426,8 +425,7 @@ Symbol *SymbolTable<ELFT>::addSynthetic(
   bool WasInserted;
   std::tie(S, WasInserted) = insert(N, STT_NOTYPE, /*Visibility*/ StOther & 0x3,
                                     /*CanOmitFromDynSym*/ false,
-                                    /*HasUnnamedAddr*/ false,
-                                    /*IsUsedInRegularObj*/ true, nullptr);
+                                    /*HasUnnamedAddr*/ false, nullptr);
   int Cmp = compareDefinedNonCommon(S, WasInserted, STB_GLOBAL);
   if (Cmp > 0)
     replaceBody<DefinedSynthetic<ELFT>>(S, N, Value, Section);
@@ -447,7 +445,7 @@ void SymbolTable<ELFT>::addShared(Shared
   bool WasInserted;
   std::tie(S, WasInserted) =
       insert(Name, Sym.getType(), STV_DEFAULT, /*CanOmitFromDynSym*/ true,
-             /*HasUnnamedAddr*/ false, /*IsUsedInRegularObj*/ false, F);
+             /*HasUnnamedAddr*/ false, F);
   // Make sure we preempt DSO symbols with default visibility.
   if (Sym.getVisibility() == STV_DEFAULT)
     S->ExportDynamic = true;
@@ -466,8 +464,7 @@ Symbol *SymbolTable<ELFT>::addBitcode(St
   Symbol *S;
   bool WasInserted;
   std::tie(S, WasInserted) =
-      insert(Name, Type, StOther & 3, CanOmitFromDynSym, HasUnnamedAddr,
-             /*IsUsedInRegularObj*/ false, F);
+      insert(Name, Type, StOther & 3, CanOmitFromDynSym, HasUnnamedAddr, F);
   int Cmp = compareDefinedNonCommon(S, WasInserted, Binding);
   if (Cmp > 0)
     replaceBody<DefinedRegular<ELFT>>(S, Name, StOther, Type, F);

Modified: lld/trunk/ELF/SymbolTable.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.h?rev=280243&r1=280242&r2=280243&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.h (original)
+++ lld/trunk/ELF/SymbolTable.h Wed Aug 31 08:49:23 2016
@@ -95,8 +95,7 @@ private:
   std::pair<Symbol *, bool> insert(StringRef &Name);
   std::pair<Symbol *, bool> insert(StringRef &Name, uint8_t Type,
                                    uint8_t Visibility, bool CanOmitFromDynSym,
-                                   bool HasUnnamedAddr, bool IsUsedInRegularObj,
-                                   InputFile *File);
+                                   bool HasUnnamedAddr, InputFile *File);
 
   std::string conflictMsg(SymbolBody *Existing, InputFile *NewFile);
   void reportDuplicate(SymbolBody *Existing, InputFile *NewFile);