[lld] 88e4056 - [lld][WebAssembly] Fix typo in function name

[Sam Clegg via llvm-commits]

Author: Sam Clegg
Date: 2021-02-08T19:41:01-08:00
New Revision: 88e4056b44ade043377a8052d342daf4fdc276fe

URL: https://github.com/llvm/llvm-project/commit/88e4056b44ade043377a8052d342daf4fdc276fe
DIFF: https://github.com/llvm/llvm-project/commit/88e4056b44ade043377a8052d342daf4fdc276fe.diff

LOG: [lld][WebAssembly] Fix typo in function name

addOptionalGlobalSymbols should be addOptionalGlobalSymbol.

Also, remove unnecessary additional argument to make the signature match
the sibling function: addOptionalDataSymbol.

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

Added: 
    

Modified: 
    lld/wasm/Driver.cpp
    lld/wasm/SymbolTable.cpp
    lld/wasm/SymbolTable.h

Removed: 
    


################################################################################
diff  --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp
index 830e4bf1744f..5927d1b53e7d 100644
--- a/lld/wasm/Driver.cpp
+++ b/lld/wasm/Driver.cpp
@@ -596,8 +596,7 @@ static GlobalSymbol *createGlobalVariable(StringRef name, bool isMutable) {
 
 static GlobalSymbol *createOptionalGlobal(StringRef name, bool isMutable) {
   InputGlobal *g = createGlobal(name, isMutable);
-  return symtab->addOptionalGlobalSymbols(name, WASM_SYMBOL_VISIBILITY_HIDDEN,
-                                          g);
+  return symtab->addOptionalGlobalSymbol(name, g);
 }
 
 // Create ABI-defined synthetic symbols

diff  --git a/lld/wasm/SymbolTable.cpp b/lld/wasm/SymbolTable.cpp
index d93b2a14dc5a..aab97d9de681 100644
--- a/lld/wasm/SymbolTable.cpp
+++ b/lld/wasm/SymbolTable.cpp
@@ -258,16 +258,16 @@ DefinedGlobal *SymbolTable::addSyntheticGlobal(StringRef name, uint32_t flags,
                                       nullptr, global);
 }
 
-DefinedGlobal *SymbolTable::addOptionalGlobalSymbols(StringRef name,
-                                                     uint32_t flags,
-                                                     InputGlobal *global) {
-  LLVM_DEBUG(dbgs() << "addOptionalGlobalSymbols: " << name << " -> " << global
+DefinedGlobal *SymbolTable::addOptionalGlobalSymbol(StringRef name,
+                                                    InputGlobal *global) {
+  LLVM_DEBUG(dbgs() << "addOptionalGlobalSymbol: " << name << " -> " << global
                     << "\n");
   Symbol *s = find(name);
   if (!s || s->isDefined())
     return nullptr;
   syntheticGlobals.emplace_back(global);
-  return replaceSymbol<DefinedGlobal>(s, name, flags, nullptr, global);
+  return replaceSymbol<DefinedGlobal>(s, name, WASM_SYMBOL_VISIBILITY_HIDDEN,
+                                      nullptr, global);
 }
 
 DefinedTable *SymbolTable::addSyntheticTable(StringRef name, uint32_t flags,

diff  --git a/lld/wasm/SymbolTable.h b/lld/wasm/SymbolTable.h
index ce7219c3ba4f..f3510f82fc8a 100644
--- a/lld/wasm/SymbolTable.h
+++ b/lld/wasm/SymbolTable.h
@@ -91,8 +91,7 @@ class SymbolTable {
   DefinedFunction *addSyntheticFunction(StringRef name, uint32_t flags,
                                         InputFunction *function);
   DefinedData *addOptionalDataSymbol(StringRef name, uint64_t value = 0);
-  DefinedGlobal *addOptionalGlobalSymbols(StringRef name, uint32_t flags,
-                                          InputGlobal *global);
+  DefinedGlobal *addOptionalGlobalSymbol(StringRef name, InputGlobal *global);
   DefinedTable *addSyntheticTable(StringRef name, uint32_t flags,
                                   InputTable *global);