forked from OSchip/llvm-project
[WebAssembly] Don't mark lazy symbols as `IsUsedInRegularObj`
This matches the ELF does. Update the comment in ELF/Symbols.h and duplicate it in wasm/Symbols.h This a followup on rL355580 and rL355577. Differential Revision: https://reviews.llvm.org/D59075 llvm-svn: 355737
This commit is contained in:
parent
c12f159788
commit
d15a4154a8
|
@ -109,8 +109,8 @@ public:
|
|||
|
||||
// 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
|
||||
|
|
|
@ -191,7 +191,7 @@ DefinedFunction *SymbolTable::addSyntheticFunction(StringRef Name,
|
|||
LLVM_DEBUG(dbgs() << "addSyntheticFunction: " << Name << "\n");
|
||||
assert(!find(Name));
|
||||
SyntheticFunctions.emplace_back(Function);
|
||||
return replaceSymbol<DefinedFunction>(insert(Name, nullptr).first, Name,
|
||||
return replaceSymbol<DefinedFunction>(insertName(Name).first, Name,
|
||||
Flags, nullptr, Function);
|
||||
}
|
||||
|
||||
|
@ -199,7 +199,7 @@ DefinedData *SymbolTable::addSyntheticDataSymbol(StringRef Name,
|
|||
uint32_t Flags) {
|
||||
LLVM_DEBUG(dbgs() << "addSyntheticDataSymbol: " << Name << "\n");
|
||||
assert(!find(Name));
|
||||
return replaceSymbol<DefinedData>(insert(Name, nullptr).first, Name, Flags);
|
||||
return replaceSymbol<DefinedData>(insertName(Name).first, Name, Flags);
|
||||
}
|
||||
|
||||
DefinedGlobal *SymbolTable::addSyntheticGlobal(StringRef Name, uint32_t Flags,
|
||||
|
@ -208,7 +208,7 @@ DefinedGlobal *SymbolTable::addSyntheticGlobal(StringRef Name, uint32_t Flags,
|
|||
<< "\n");
|
||||
assert(!find(Name));
|
||||
SyntheticGlobals.emplace_back(Global);
|
||||
return replaceSymbol<DefinedGlobal>(insert(Name, nullptr).first, Name, Flags,
|
||||
return replaceSymbol<DefinedGlobal>(insertName(Name).first, Name, Flags,
|
||||
nullptr, Global);
|
||||
}
|
||||
|
||||
|
@ -442,7 +442,7 @@ void SymbolTable::addLazy(ArchiveFile *File, const Archive::Symbol *Sym) {
|
|||
|
||||
Symbol *S;
|
||||
bool WasInserted;
|
||||
std::tie(S, WasInserted) = insert(Name, nullptr);
|
||||
std::tie(S, WasInserted) = insertName(Name);
|
||||
|
||||
if (WasInserted) {
|
||||
replaceSymbol<LazySymbol>(S, Name, 0, File, *Sym);
|
||||
|
|
|
@ -98,8 +98,14 @@ public:
|
|||
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.
|
||||
|
|
|
@ -950,7 +950,7 @@ void Writer::assignSymtab() {
|
|||
};
|
||||
|
||||
for (Symbol *Sym : Symtab->getSymbols())
|
||||
if (!Sym->isLazy() && Sym->IsUsedInRegularObj)
|
||||
if (Sym->IsUsedInRegularObj)
|
||||
AddSymbol(Sym);
|
||||
|
||||
for (ObjFile *File : Symtab->ObjectFiles) {
|
||||
|
|
Loading…
Reference in New Issue