Index: lld/trunk/ELF/Symbols.h =================================================================== --- lld/trunk/ELF/Symbols.h +++ lld/trunk/ELF/Symbols.h @@ -109,8 +109,8 @@ // True if the symbol was used for linking and thus need to be added to the // output file's symbol table. This is true for all symbols except for - // unreferenced DSO symbols and bitcode symbols that are unreferenced except - // by other bitcode objects. + // unreferenced DSO symbols, lazy (archive) symbols, and bitcode symbols that + // are unreferenced except by other bitcode objects. unsigned IsUsedInRegularObj : 1; // If this flag is true and the symbol has protected or default visibility, it Index: lld/trunk/wasm/SymbolTable.cpp =================================================================== --- lld/trunk/wasm/SymbolTable.cpp +++ lld/trunk/wasm/SymbolTable.cpp @@ -191,7 +191,7 @@ LLVM_DEBUG(dbgs() << "addSyntheticFunction: " << Name << "\n"); assert(!find(Name)); SyntheticFunctions.emplace_back(Function); - return replaceSymbol(insert(Name, nullptr).first, Name, + return replaceSymbol(insertName(Name).first, Name, Flags, nullptr, Function); } @@ -199,7 +199,7 @@ uint32_t Flags) { LLVM_DEBUG(dbgs() << "addSyntheticDataSymbol: " << Name << "\n"); assert(!find(Name)); - return replaceSymbol(insert(Name, nullptr).first, Name, Flags); + return replaceSymbol(insertName(Name).first, Name, Flags); } DefinedGlobal *SymbolTable::addSyntheticGlobal(StringRef Name, uint32_t Flags, @@ -208,7 +208,7 @@ << "\n"); assert(!find(Name)); SyntheticGlobals.emplace_back(Global); - return replaceSymbol(insert(Name, nullptr).first, Name, Flags, + return replaceSymbol(insertName(Name).first, Name, Flags, nullptr, Global); } @@ -442,7 +442,7 @@ Symbol *S; bool WasInserted; - std::tie(S, WasInserted) = insert(Name, nullptr); + std::tie(S, WasInserted) = insertName(Name); if (WasInserted) { replaceSymbol(S, Name, 0, File, *Sym); Index: lld/trunk/wasm/Symbols.h =================================================================== --- lld/trunk/wasm/Symbols.h +++ lld/trunk/wasm/Symbols.h @@ -98,8 +98,14 @@ WasmSymbolType getWasmType() const; bool isExported() const; - // True if this symbol was referenced by a regular (non-bitcode) object. + // True if the symbol was used for linking and thus need to be added to the + // output file's symbol table. This is true for all symbols except for + // unreferenced DSO symbols, lazy (archive) symbols, and bitcode symbols that + // are unreferenced except by other bitcode objects. unsigned IsUsedInRegularObj : 1; + + // True if ths symbol is explicity marked for export (i.e. via the -e/--export + // command line flag) unsigned ForceExport : 1; // True if this symbol is specified by --trace-symbol option. Index: lld/trunk/wasm/Writer.cpp =================================================================== --- lld/trunk/wasm/Writer.cpp +++ lld/trunk/wasm/Writer.cpp @@ -950,7 +950,7 @@ }; for (Symbol *Sym : Symtab->getSymbols()) - if (!Sym->isLazy() && Sym->IsUsedInRegularObj) + if (Sym->IsUsedInRegularObj) AddSymbol(Sym); for (ObjFile *File : Symtab->ObjectFiles) {