Skip to content

Commit f268495

Browse files
authored
[lld][WebAssembly] Rename fetch() to extract() to match ELF linker. NFC (llvm#78625)
1 parent da4b8ab commit f268495

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

lld/wasm/Driver.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ static Symbol *handleUndefined(StringRef name, const char *option) {
705705
sym->isUsedInRegularObj = true;
706706

707707
if (auto *lazySym = dyn_cast<LazySymbol>(sym)) {
708-
lazySym->fetch();
708+
lazySym->extract();
709709
if (!config->whyExtract.empty())
710710
config->whyExtractRecords.emplace_back(option, sym->getFile(), *sym);
711711
}
@@ -724,7 +724,7 @@ static void handleLibcall(StringRef name) {
724724
if (!config->whyExtract.empty())
725725
config->whyExtractRecords.emplace_back("<libcall>", sym->getFile(),
726726
*sym);
727-
lazySym->fetch();
727+
lazySym->extract();
728728
}
729729
}
730730
}
@@ -965,7 +965,7 @@ static void processStubLibraries() {
965965
needed->forceExport = true;
966966
if (auto *lazy = dyn_cast<LazySymbol>(needed)) {
967967
depsAdded = true;
968-
lazy->fetch();
968+
lazy->extract();
969969
if (!config->whyExtract.empty())
970970
config->whyExtractRecords.emplace_back(stub_file->getName(),
971971
sym->getFile(), *sym);

lld/wasm/SymbolTable.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ Symbol *SymbolTable::addUndefinedFunction(StringRef name,
533533
lazy->setWeak();
534534
lazy->signature = sig;
535535
} else {
536-
lazy->fetch();
536+
lazy->extract();
537537
if (!config->whyExtract.empty())
538538
config->whyExtractRecords.emplace_back(toString(file), s->getFile(),
539539
*s);
@@ -586,7 +586,7 @@ Symbol *SymbolTable::addUndefinedData(StringRef name, uint32_t flags,
586586
if ((flags & WASM_SYMBOL_BINDING_MASK) == WASM_SYMBOL_BINDING_WEAK)
587587
lazy->setWeak();
588588
else
589-
lazy->fetch();
589+
lazy->extract();
590590
} else if (s->isDefined()) {
591591
checkDataType(s, file);
592592
} else if (s->isWeak()) {
@@ -613,7 +613,7 @@ Symbol *SymbolTable::addUndefinedGlobal(StringRef name,
613613
replaceSymbol<UndefinedGlobal>(s, name, importName, importModule, flags,
614614
file, type);
615615
else if (auto *lazy = dyn_cast<LazySymbol>(s))
616-
lazy->fetch();
616+
lazy->extract();
617617
else if (s->isDefined())
618618
checkGlobalType(s, file, type);
619619
else if (s->isWeak())
@@ -639,7 +639,7 @@ Symbol *SymbolTable::addUndefinedTable(StringRef name,
639639
replaceSymbol<UndefinedTable>(s, name, importName, importModule, flags,
640640
file, type);
641641
else if (auto *lazy = dyn_cast<LazySymbol>(s))
642-
lazy->fetch();
642+
lazy->extract();
643643
else if (s->isDefined())
644644
checkTableType(s, file, type);
645645
else if (s->isWeak())
@@ -665,7 +665,7 @@ Symbol *SymbolTable::addUndefinedTag(StringRef name,
665665
replaceSymbol<UndefinedTag>(s, name, importName, importModule, flags, file,
666666
sig);
667667
else if (auto *lazy = dyn_cast<LazySymbol>(s))
668-
lazy->fetch();
668+
lazy->extract();
669669
else if (s->isDefined())
670670
checkTagType(s, file, sig);
671671
else if (s->isWeak())

lld/wasm/Symbols.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,9 @@ const OutputSectionSymbol *SectionSymbol::getOutputSectionSymbol() const {
425425
return section->outputSec->sectionSym;
426426
}
427427

428-
void LazySymbol::fetch() { cast<ArchiveFile>(file)->addMember(&archiveSymbol); }
428+
void LazySymbol::extract() {
429+
cast<ArchiveFile>(file)->addMember(&archiveSymbol);
430+
}
429431

430432
void LazySymbol::setWeak() {
431433
flags |= (flags & ~WASM_SYMBOL_BINDING_MASK) | WASM_SYMBOL_BINDING_WEAK;

lld/wasm/Symbols.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ class LazySymbol : public Symbol {
502502
: Symbol(name, LazyKind, flags, file), archiveSymbol(sym) {}
503503

504504
static bool classof(const Symbol *s) { return s->kind() == LazyKind; }
505-
void fetch();
505+
void extract();
506506
void setWeak();
507507
MemoryBufferRef getMemberBuffer();
508508

0 commit comments

Comments
 (0)