Move code for symbol resolution from SymbolTable.cpp to Symbols.cpp.

My recent commits separated symbol resolution from the symbol table,
so the functions to resolve symbols are now in a somewhat wrong file.
This patch moves it to Symbols.cpp.

The functions are now member functions of the symbol.

This is code move change. I modified function names so that they are
appropriate as member functions, though. No functionality change
intended.

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

llvm-svn: 361474

Author: rui314

lld/ELF/Driver.cpp

@@ -1314,7 +1314,7 @@ static void handleUndefined(StringRef Name) {
   Sym->IsUsedInRegularObj = true;
 
   if (Sym->isLazy())
-    Symtab->fetchLazy(Sym);
+    Sym->fetch();
 }
 
 static void handleLibcall(StringRef Name) {
@@ -1329,7 +1329,7 @@ static void handleLibcall(StringRef Name) {
     MB = cast<LazyArchive>(Sym)->getMemberBuffer();
 
   if (isBitcode(MB))
-    Symtab->fetchLazy(Sym);
+    Sym->fetch();
 }
 
 // Replaces common symbols with defined symbols reside in .bss sections.

lld/ELF/InputFiles.cpp

@@ -963,8 +963,7 @@ template <class ELFT> void ObjFile<ELFT>::initializeSymbols() {
 
     // Handle global undefined symbols.
     if (ESym.st_shndx == SHN_UNDEF) {
-      resolveSymbol(this->Symbols[I],
-                    Undefined{this, Name, Binding, StOther, Type});
+      this->Symbols[I]->resolve(Undefined{this, Name, Binding, StOther, Type});
       continue;
     }
 
@@ -973,8 +972,8 @@ template <class ELFT> void ObjFile<ELFT>::initializeSymbols() {
       if (Value == 0 || Value >= UINT32_MAX)
         fatal(toString(this) + ": common symbol '" + StringRef(Name.Data) +
               "' has invalid alignment: " + Twine(Value));
-      resolveSymbol(this->Symbols[I], CommonSymbol{this, Name, Binding, StOther,
-                                                   Type, Value, Size});
+      this->Symbols[I]->resolve(
+          CommonSymbol{this, Name, Binding, StOther, Type, Value, Size});
       continue;
     }
 
@@ -984,16 +983,16 @@ template <class ELFT> void ObjFile<ELFT>::initializeSymbols() {
     // COMDAT member sections, and if a comdat group is discarded, some
     // defined symbol in a .eh_frame becomes dangling symbols.
     if (Sec == &InputSection::Discarded) {
-      resolveSymbol(this->Symbols[I],
-                    Undefined{this, Name, Binding, StOther, Type, SecIdx});
+      this->Symbols[I]->resolve(
+          Undefined{this, Name, Binding, StOther, Type, SecIdx});
       continue;
     }
 
     // Handle global defined symbols.
     if (Binding == STB_GLOBAL || Binding == STB_WEAK ||
         Binding == STB_GNU_UNIQUE) {
-      resolveSymbol(this->Symbols[I], Defined{this, Name, Binding, StOther,
-                                              Type, Value, Size, Sec});
+      this->Symbols[I]->resolve(
+          Defined{this, Name, Binding, StOther, Type, Value, Size, Sec});
       continue;
     }
 
@@ -1532,13 +1531,13 @@ template <class ELFT> void LazyObjFile::parse() {
 
     // Replace existing symbols with LazyObject symbols.
     //
-    // resolveSymbol() may trigger this->fetch() if an existing symbol
-    // is an undefined symbol. If that happens, this LazyObjFile has
-    // served its purpose, and we can exit from the loop early.
+    // resolve() may trigger this->fetch() if an existing symbol is an
+    // undefined symbol. If that happens, this LazyObjFile has served
+    // its purpose, and we can exit from the loop early.
     for (Symbol *Sym : this->Symbols) {
       if (!Sym)
         continue;
-      resolveSymbol(Sym, LazyObject{*this, Sym->getName()});
+      Sym->resolve(LazyObject{*this, Sym->getName()});
       if (AddedToLink)
         return;
     }

lld/ELF/LinkerScript.cpp

@@ -185,7 +185,7 @@ void LinkerScript::addSymbol(SymbolAssignment *Cmd) {
               0, Sec);
 
   Symbol *Sym = Symtab->insert(Cmd->Name);
-  mergeSymbolProperties(Sym, New);
+  Sym->mergeProperties(New);
   Sym->replace(New);
   Cmd->Sym = cast<Defined>(Sym);
 }
@@ -202,7 +202,7 @@ static void declareSymbol(SymbolAssignment *Cmd) {
 
   // We can't calculate final value right now.
   Symbol *Sym = Symtab->insert(Cmd->Name);
-  mergeSymbolProperties(Sym, New);
+  Sym->mergeProperties(New);
   Sym->replace(New);
 
   Cmd->Sym = cast<Defined>(Sym);