From 54ee6df2477842ff61b00adb262ef7e8bd057ef0 Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@google.com>
Date: Thu, 16 May 2019 03:54:50 +0000
Subject: [PATCH] Pemove SymbolTable::addBitcode as it is redundant.

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

llvm-svn: 360846
---
 lld/ELF/InputFiles.cpp  |  2 +-
 lld/ELF/SymbolTable.cpp | 17 -----------------
 lld/ELF/SymbolTable.h   |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index ba6a6fd..d22fa74 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -1291,7 +1291,7 @@ static Symbol *createBitcodeSymbol(const std::vector<bool> &KeptComdats,
   Defined New(&F, Name, Binding, Visibility, Type, 0, 0, nullptr);
   if (CanOmitFromDynSym)
     New.ExportDynamic = false;
-  return Symtab->addBitcode(New);
+  return Symtab->addDefined(New);
 }
 
 template <class ELFT>
diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp
index 102a7cf..38cc4d5 100644
--- a/lld/ELF/SymbolTable.cpp
+++ b/lld/ELF/SymbolTable.cpp
@@ -404,23 +404,6 @@ Symbol *SymbolTable::addShared(const SharedSymbol &New) {
   return Old;
 }
 
-Symbol *SymbolTable::addBitcode(const Defined &New) {
-  Symbol *Old = insert(New);
-  mergeProperties(Old, New);
-
-  if (Old->isPlaceholder()) {
-    replaceSymbol(Old, &New);
-    return Old;
-  }
-
-  int Cmp = compare(Old, &New);
-  if (Cmp > 0)
-    replaceSymbol(Old, &New);
-  else if (Cmp == 0)
-    reportDuplicate(Old, New.File, nullptr, 0);
-  return Old;
-}
-
 Symbol *SymbolTable::find(StringRef Name) {
   auto It = SymMap.find(CachedHashStringRef(Name));
   if (It == SymMap.end())
diff --git a/lld/ELF/SymbolTable.h b/lld/ELF/SymbolTable.h
index eb5fd1f..2c9d4e5 100644
--- a/lld/ELF/SymbolTable.h
+++ b/lld/ELF/SymbolTable.h
@@ -50,7 +50,6 @@ public:
   Symbol *addShared(const SharedSymbol &New);
   Symbol *addLazyArchive(const LazyArchive &New);
   Symbol *addLazyObject(const LazyObject &New);
-  Symbol *addBitcode(const Defined &New);
   Symbol *addCommon(const CommonSymbol &New);
 
   Symbol *insert(const Symbol &New);
-- 
2.7.4