[WebAssembly] Refactor relocation processing. NFC.
This is the remaining NFC part of https://reviews.llvm.org/D61539 which
was reverted.
Differential Revision: https://reviews.llvm.org/D61800
git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@360598 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/wasm/Writer.cpp b/wasm/Writer.cpp
index 8ed4d6b..fedaa54 100644
--- a/wasm/Writer.cpp
+++ b/wasm/Writer.cpp
@@ -1152,35 +1152,38 @@
ObjFile *File = Chunk->File;
ArrayRef<WasmSignature> Types = File->getWasmObj()->types();
for (const WasmRelocation &Reloc : Chunk->getRelocations()) {
+ if (Reloc.Type == R_WASM_TYPE_INDEX_LEB) {
+ // Mark target type as live
+ File->TypeMap[Reloc.Index] = registerType(Types[Reloc.Index]);
+ File->TypeIsUsed[Reloc.Index] = true;
+ continue;
+ }
+
+ // Other relocation types all have a corresponding symbol
+ auto *Sym = File->getSymbols()[Reloc.Index];
switch (Reloc.Type) {
case R_WASM_TABLE_INDEX_I32:
case R_WASM_TABLE_INDEX_SLEB:
case R_WASM_TABLE_INDEX_REL_SLEB: {
- FunctionSymbol *Sym = File->getFunctionSymbol(Reloc.Index);
- if (Sym->hasTableIndex() || !Sym->hasFunctionIndex() || requiresGOTAccess(Sym))
+ auto *F = cast<FunctionSymbol>(Sym);
+ if (F->hasTableIndex() || !F->hasFunctionIndex() || requiresGOTAccess(F))
break;
- Sym->setTableIndex(TableBase + IndirectFunctions.size());
- IndirectFunctions.emplace_back(Sym);
+ F->setTableIndex(TableBase + IndirectFunctions.size());
+ IndirectFunctions.emplace_back(F);
break;
}
case R_WASM_TYPE_INDEX_LEB:
- // Mark target type as live
- File->TypeMap[Reloc.Index] = registerType(Types[Reloc.Index]);
- File->TypeIsUsed[Reloc.Index] = true;
break;
- case R_WASM_GLOBAL_INDEX_LEB: {
- auto* Sym = File->getSymbols()[Reloc.Index];
+ case R_WASM_GLOBAL_INDEX_LEB:
if (!isa<GlobalSymbol>(Sym) && !Sym->isInGOT()) {
Sym->setGOTIndex(NumImportedGlobals++);
GOTSymbols.push_back(Sym);
}
break;
- }
case R_WASM_MEMORY_ADDR_SLEB:
case R_WASM_MEMORY_ADDR_LEB:
- case R_WASM_MEMORY_ADDR_REL_SLEB: {
+ case R_WASM_MEMORY_ADDR_REL_SLEB:
if (!Config->Relocatable) {
- auto* Sym = File->getSymbols()[Reloc.Index];
if (Sym->isUndefined() && !Sym->isWeak()) {
error(toString(File) + ": cannot resolve relocation of type " +
relocTypeToString(Reloc.Type) +
@@ -1189,34 +1192,29 @@
}
break;
}
- }
if (Config->Pic) {
switch (Reloc.Type) {
case R_WASM_TABLE_INDEX_SLEB:
case R_WASM_MEMORY_ADDR_SLEB:
- case R_WASM_MEMORY_ADDR_LEB: {
+ case R_WASM_MEMORY_ADDR_LEB:
// Certain relocation types can't be used when building PIC output, since
// they would require absolute symbol addresses at link time.
- Symbol *Sym = File->getSymbols()[Reloc.Index];
error(toString(File) + ": relocation " +
relocTypeToString(Reloc.Type) + " cannot be used againt symbol " +
toString(*Sym) + "; recompile with -fPIC");
break;
- }
case R_WASM_TABLE_INDEX_I32:
- case R_WASM_MEMORY_ADDR_I32: {
+ case R_WASM_MEMORY_ADDR_I32:
// These relocation types are only present in the data section and
// will be converted into code by `generateRelocationCode`. This code
// requires the symbols to have GOT entires.
- auto* Sym = File->getSymbols()[Reloc.Index];
if (requiresGOTAccess(Sym) && !Sym->isInGOT()) {
Sym->setGOTIndex(NumImportedGlobals++);
GOTSymbols.push_back(Sym);
}
break;
}
- }
}
}
}