[WebAssembly] Cleanup methods for add synthetic symbols to symbtab. NFC.
These were duplicating (incorrectly) some of the logic for
handling conflicts, but since they are only ever added right
at the start we can assume no existing symbols.
Also rename these methods for clarity.
Differential Revision: https://reviews.llvm.org/D43252
llvm-svn: 325045
diff --git a/lld/wasm/SymbolTable.cpp b/lld/wasm/SymbolTable.cpp
index 68b15e8..bedd919 100644
--- a/lld/wasm/SymbolTable.cpp
+++ b/lld/wasm/SymbolTable.cpp
@@ -127,38 +127,26 @@
return checkSymbolTypes(Existing, F, Kind, Sig);
}
-Symbol *SymbolTable::addDefinedFunction(StringRef Name,
- const WasmSignature *Type,
- uint32_t Flags) {
- DEBUG(dbgs() << "addDefinedFunction: " << Name << "\n");
+Symbol *SymbolTable::addSyntheticFunction(StringRef Name,
+ const WasmSignature *Type,
+ uint32_t Flags) {
+ DEBUG(dbgs() << "addSyntheticFunction: " << Name << "\n");
Symbol *S;
bool WasInserted;
std::tie(S, WasInserted) = insert(Name);
- if (WasInserted) {
- S->update(Symbol::DefinedFunctionKind, nullptr, Flags);
- S->setFunctionType(Type);
- } else if (!S->isFunction()) {
- error("symbol type mismatch: " + Name);
- } else if (!S->isDefined()) {
- DEBUG(dbgs() << "resolving existing undefined function: " << Name << "\n");
- S->update(Symbol::DefinedFunctionKind, nullptr, Flags);
- }
+ assert(WasInserted);
+ S->update(Symbol::DefinedFunctionKind, nullptr, Flags);
+ S->setFunctionType(Type);
return S;
}
-Symbol *SymbolTable::addDefinedGlobal(StringRef Name) {
- DEBUG(dbgs() << "addDefinedGlobal: " << Name << "\n");
+Symbol *SymbolTable::addSyntheticGlobal(StringRef Name) {
+ DEBUG(dbgs() << "addSyntheticGlobal: " << Name << "\n");
Symbol *S;
bool WasInserted;
std::tie(S, WasInserted) = insert(Name);
- if (WasInserted) {
- S->update(Symbol::DefinedGlobalKind);
- } else if (!S->isGlobal()) {
- error("symbol type mismatch: " + Name);
- } else {
- DEBUG(dbgs() << "resolving existing undefined global: " << Name << "\n");
- S->update(Symbol::DefinedGlobalKind);
- }
+ assert(WasInserted);
+ S->update(Symbol::DefinedGlobalKind);
return S;
}