Skip to content

Commit 22b7b84

Browse files
sbc100sbc100
authored
[lld][WebAssembly] Report undefined symbols in -shared/-pie builds (#75242)
Previously we would ignore all undefined symbols when using `-shared` or `-pie`. All undefined symbols would be treated as imports regardless of whether those symbols we defined in any shared library. With this change we now track symbol in shared libraries and report undefined symbols in the main program by default. The old behavior is still available via the `--unresolved-symbols=import-dynamic` command line flag. This rationale for allowing this type of breaking change is that `-pie` and `-shared` are both still experimental will warn as such, unless `--experimental-pic` is passed. As part of this change the linker now models shared library symbols via new SharedFunctionSymbol and SharedDataSymbol types. I've also added a new `--no-shlib-sigcheck` option that bypassed the checking of functions signature in shared libraries. This is specifically required by emscripten the case where the imports/exports of shared libraries have been modified by via JS type legalization (this is only needed when targeting old JS engines where bigint is not yet available See emscripten-core/emscripten#18198
1 parent ef8207b commit 22b7b84

27 files changed

+356
-75
lines changed

‎lld/test/wasm/Inputs/ret32.s

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
.hidden ret32
21
.globl ret32
32
ret32:
43
.functype ret32 (f32) -> (i32)

‎lld/test/wasm/dylink.s

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-emscripten -o %t.o %s
2+
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-emscripten %p/Inputs/ret32.s -o %t.ret32.o
3+
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-emscripten %p/Inputs/libsearch-dyn.s -o %t.dyn.o
4+
# RUN: wasm-ld --experimental-pic -shared %t.ret32.o %t.dyn.o -o %t.lib.so
5+
# RUN: not wasm-ld --experimental-pic -pie -o %t.wasm %t.o 2>&1 | FileCheck --check-prefix=ERROR %s
6+
# RUN: wasm-ld --experimental-pic -pie -o %t.wasm %t.o %t.lib.so
7+
# RUN: obj2yaml %t.wasm | FileCheck %s
8+
9+
# ERROR: error: {{.*}}: undefined symbol: ret32
10+
# ERROR: error: {{.*}}: undefined symbol: _bar
11+
.functype ret32 (f32) -> (i32)
12+
13+
.globl _start
14+
_start:
15+
.functype _start () -> ()
16+
f32.const 0.0
17+
call ret32
18+
drop
19+
i32.const _bar@GOT
20+
drop
21+
end_function
22+
23+
# CHECK: Sections:
24+
# CHECK-NEXT: - Type: CUSTOM
25+
# CHECK-NEXT: Name: dylink.0
26+
# CHECK-NEXT: MemorySize: 0
27+
# CHECK-NEXT: MemoryAlignment: 0
28+
# CHECK-NEXT: TableSize: 0
29+
# CHECK-NEXT: TableAlignment: 0
30+
# CHECK-NEXT: Needed:
31+
# CHECK-NEXT: - {{.*}}.lib.so

‎lld/test/wasm/emit-relocs.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ foo:
5454
# CHECK-NEXT: - Index: 1
5555
# CHECK-NEXT: Kind: FUNCTION
5656
# CHECK-NEXT: Name: ret32
57-
# CHECK-NEXT: Flags: [ VISIBILITY_HIDDEN ]
57+
# CHECK-NEXT: Flags: [ ]
5858
# CHECK-NEXT: Function: 1
5959
# CHECK-NEXT: - Index: 2
6060
# CHECK-NEXT: Kind: DATA

‎lld/test/wasm/no-shlib-sigcheck.s

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-emscripten -o %t.o %s
2+
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-emscripten %p/Inputs/ret32.s -o %t.ret32.o
3+
# RUN: wasm-ld --experimental-pic -shared %t.ret32.o -o %t.lib.so
4+
5+
## Fails with signature mismatch by default
6+
# RUN: not wasm-ld --experimental-pic -pie -o %t.wasm %t.o %t.lib.so 2>&1 | FileCheck --check-prefix=ERROR %s
7+
## Same again with shared library first.
8+
# RUN: not wasm-ld --experimental-pic -pie -o %t.wasm %t.lib.so %t.o 2>&1 | FileCheck --check-prefix=ERROR %s
9+
10+
## Succeeds with --no-shlib-sigcheck added
11+
# RUN: wasm-ld --experimental-pic -pie -o %t.wasm %t.o %t.lib.so --no-shlib-sigcheck
12+
# RUN: obj2yaml %t.wasm | FileCheck %s
13+
## Same again with shared library first.
14+
# RUN: wasm-ld --experimental-pic -pie -o %t.wasm %t.lib.so %t.o --no-shlib-sigcheck
15+
# RUN: obj2yaml %t.wasm | FileCheck %s
16+
17+
.functype ret32 (f32) -> (i64)
18+
19+
.globl _start
20+
_start:
21+
.functype _start () -> ()
22+
f32.const 0.0
23+
call ret32
24+
drop
25+
end_function
26+
27+
# ERROR: wasm-ld: error: function signature mismatch: ret32
28+
# ERROR: >>> defined as (f32) -> i64 in {{.*}}.o
29+
30+
# CHECK: - Type: TYPE
31+
# CHECK-NEXT: Signatures:
32+
# CHECK-NEXT: - Index: 0
33+
# CHECK-NEXT: ParamTypes:
34+
# CHECK-NEXT: - F32
35+
# CHECK-NEXT: ReturnTypes:
36+
# CHECK-NEXT: - I64
37+
# CHECK-NEXT: - Index: 1
38+
# CHECK-NEXT: ParamTypes: []
39+
# CHECK-NEXT: ReturnTypes: []

‎lld/test/wasm/pie.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-emscripten -o %t.o %s
22
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-emscripten %S/Inputs/internal_func.s -o %t.internal_func.o
3-
# RUN: wasm-ld --no-gc-sections --experimental-pic -pie -o %t.wasm %t.o %t.internal_func.o
3+
# RUN: wasm-ld --no-gc-sections --experimental-pic -pie --unresolved-symbols=import-dynamic -o %t.wasm %t.o %t.internal_func.o
44
# RUN: obj2yaml %t.wasm | FileCheck %s
55
# RUN: llvm-objdump --disassemble-symbols=__wasm_call_ctors,__wasm_apply_data_relocs --no-show-raw-insn --no-leading-addr %t.wasm | FileCheck %s --check-prefixes DISASSEM
66

@@ -150,7 +150,7 @@ _start:
150150
# instruction in the InitExpr. We also, therefore, do not need these globals
151151
# to be mutable.
152152

153-
# RUN: wasm-ld --no-gc-sections --experimental-pic -pie --extra-features=extended-const -o %t.extended.wasm %t.o %t.internal_func.o
153+
# RUN: wasm-ld --no-gc-sections --experimental-pic -pie --unresolved-symbols=import-dynamic --extra-features=extended-const -o %t.extended.wasm %t.o %t.internal_func.o
154154
# RUN: obj2yaml %t.extended.wasm | FileCheck %s --check-prefix=EXTENDED-CONST
155155

156156
# EXTENDED-CONST-NOT: __wasm_apply_global_relocs
@@ -207,7 +207,7 @@ _start:
207207
# to be generated along with __wasm_start as the start
208208
# function.
209209

210-
# RUN: wasm-ld --no-gc-sections --shared-memory --experimental-pic -pie -o %t.shmem.wasm %t.o %t.internal_func.o
210+
# RUN: wasm-ld --no-gc-sections --shared-memory --experimental-pic -pie --unresolved-symbols=import-dynamic -o %t.shmem.wasm %t.o %t.internal_func.o
211211
# RUN: obj2yaml %t.shmem.wasm | FileCheck %s --check-prefix=SHMEM
212212
# RUN: llvm-objdump --disassemble-symbols=__wasm_start --no-show-raw-insn --no-leading-addr %t.shmem.wasm | FileCheck %s --check-prefix DISASSEM-SHMEM
213213

‎lld/test/wasm/shared-needed.s

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown -o %t.o %s
22
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %p/Inputs/ret32.s -o %t.ret32.o
33

4-
# RUN: wasm-ld -shared --experimental-pic -o %t1.so %t.o
5-
# RUN: obj2yaml %t1.so | FileCheck %s -check-prefix=SO1
4+
# RUN: wasm-ld -shared --experimental-pic -o %t.ret32.so %t.ret32.o
5+
# RUN: obj2yaml %t.ret32.so | FileCheck %s -check-prefix=SO1
6+
7+
# Without linking against the ret32.so shared object we expect an undefined
8+
# symbol error
9+
10+
# RUN: not wasm-ld -shared --experimental-pic -o %t.so %t.o 2>&1 | FileCheck %s --check-prefix=ERROR
11+
# ERROR: undefined symbol: ret32
12+
13+
# RUN: wasm-ld -shared --experimental-pic -o %t.so %t.o %t.ret32.so
14+
# RUN: obj2yaml %t.so | FileCheck %s -check-prefix=SO2
615

7-
# RUN: wasm-ld -shared --experimental-pic -o %t2.so %t1.so %t.ret32.o
8-
# RUN: obj2yaml %t2.so | FileCheck %s -check-prefix=SO2
916

1017
.globl foo
1118
.globl data
1219

20+
.functype ret32 (f32) -> (i32)
21+
1322
foo:
14-
.functype foo () -> ()
23+
.functype foo (f32) -> (i32)
24+
local.get 0
25+
call ret32
1526
end_function
1627

1728
.section .data,"",@
@@ -24,8 +35,8 @@ data:
2435
# SO1: Sections:
2536
# SO1-NEXT: - Type: CUSTOM
2637
# SO1-NEXT: Name: dylink.0
27-
# SO1-NEXT: MemorySize: 4
28-
# SO1-NEXT: MemoryAlignment: 2
38+
# SO1-NEXT: MemorySize: 0
39+
# SO1-NEXT: MemoryAlignment: 0
2940
# SO1-NEXT: TableSize: 0
3041
# SO1-NEXT: TableAlignment: 0
3142
# SO1-NEXT: Needed: []
@@ -34,10 +45,10 @@ data:
3445
# SO2: Sections:
3546
# SO2-NEXT: - Type: CUSTOM
3647
# SO2-NEXT: Name: dylink.0
37-
# SO2-NEXT: MemorySize: 0
38-
# SO2-NEXT: MemoryAlignment: 0
48+
# SO2-NEXT: MemorySize: 4
49+
# SO2-NEXT: MemoryAlignment: 2
3950
# SO2-NEXT: TableSize: 0
4051
# SO2-NEXT: TableAlignment: 0
4152
# SO2-NEXT: Needed:
42-
# SO2-NEXT: - shared-needed.s.tmp1.so
53+
# SO2-NEXT: - shared-needed.s.tmp.ret32.so
4354
# SO2-NEXT: - Type: TYPE

‎lld/test/wasm/shared.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown -o %t.o %s
2-
# RUN: wasm-ld --experimental-pic -shared -o %t.wasm %t.o
2+
# RUN: wasm-ld --experimental-pic --unresolved-symbols=import-dynamic -shared -o %t.wasm %t.o
33
# RUN: obj2yaml %t.wasm | FileCheck %s
44
# RUN: llvm-objdump --disassemble-symbols=__wasm_call_ctors,__wasm_apply_data_relocs --no-show-raw-insn --no-leading-addr %t.wasm | FileCheck %s --check-prefixes DIS
55

66
.functype func_external () -> ()
77

88
# Linker-synthesized globals
99
.globaltype __stack_pointer, i32
10-
.globaltype __table_base, i32, immutable
11-
.globaltype __memory_base, i32, immutable
10+
.globaltype __table_base, i32, immutable
11+
.globaltype __memory_base, i32, immutable
1212

1313
.section .data.data,"",@
1414
data:

‎lld/test/wasm/shared64.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# RUN: llvm-mc -filetype=obj -triple=wasm64-unknown-unknown -o %t.o %s
2-
# RUN: wasm-ld -mwasm64 --experimental-pic -shared -o %t.wasm %t.o
2+
# RUN: wasm-ld -mwasm64 --experimental-pic --unresolved-symbols=import-dynamic -shared -o %t.wasm %t.o
33
# RUN: obj2yaml %t.wasm | FileCheck %s
44
# RUN: llvm-objdump --disassemble-symbols=__wasm_call_ctors,__wasm_apply_data_relocs --no-show-raw-insn --no-leading-addr %t.wasm | FileCheck %s --check-prefixes DIS
55

‎lld/test/wasm/signature-mismatch.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ ret32_address_main:
9393
# RELOC-NEXT: - Index: 1
9494
# RELOC-NEXT: Kind: FUNCTION
9595
# RELOC-NEXT: Name: ret32
96-
# RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ]
96+
# RELOC-NEXT: Flags: [ ]
9797
# RELOC-NEXT: Function: 2
9898
# RELOC-NEXT: - Index: 2
9999
# RELOC-NEXT: Kind: DATA

‎lld/test/wasm/tag-section.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
; RUN: llc -filetype=obj -wasm-enable-eh -exception-model=wasm -mattr=+exception-handling -relocation-model=pic %p/Inputs/tag-section1.ll -o %t1.o
1212
; RUN: llc -filetype=obj -wasm-enable-eh -exception-model=wasm -mattr=+exception-handling -relocation-model=pic %p/Inputs/tag-section2.ll -o %t2.o
1313
; RUN: llc -filetype=obj -wasm-enable-eh -exception-model=wasm -mattr=+exception-handling -relocation-model=pic %s -o %t.o
14-
; RUN: wasm-ld --import-undefined --experimental-pic -pie -o %t.wasm %t.o %t1.o %t2.o
14+
; RUN: wasm-ld --import-undefined --experimental-pic --unresolved-symbols=import-dynamic -pie -o %t.wasm %t.o %t1.o %t2.o
1515
; RUN: obj2yaml %t.wasm | FileCheck %s --check-prefix=PIC
1616

1717
target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"

‎lld/test/wasm/undef-shared.s

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o
2+
# RUN: not wasm-ld --experimental-pic %t.o -o /dev/null -shared 2>&1 | FileCheck %s
3+
4+
# CHECK: error: {{.*}}: undefined symbol: hidden
5+
.global hidden
6+
.hidden hidden
7+
8+
.global foo
9+
.section .data,"",@
10+
foo:
11+
.int32 hidden
12+
.size foo,4

‎lld/test/wasm/undefined-data.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown -o %t.o %s
22
# RUN: not wasm-ld -o %t.wasm %t.o 2>&1 | FileCheck %s -check-prefix=UNDEF
33
# RUN: wasm-ld --allow-undefined -o %t.wasm %t.o
4-
# RUN: not wasm-ld --shared -o %t.wasm %t.o 2>&1 | FileCheck %s -check-prefix=SHARED
4+
# RUN: not wasm-ld --experimental-pic -shared --unresolved-symbols=import-dynamic -o %t.wasm %t.o 2>&1 | FileCheck %s -check-prefix=SHARED
55

66
.globl _start
77
_start:

‎lld/test/wasm/unresolved-symbols.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
# RUN: llvm-readobj %t4.wasm > /dev/null 2>&1
8686

8787
## import-dynamic should fail due to incompatible relocations.
88-
# RUN: not wasm-ld %t/main.o -o %t5.wasm --unresolved-symbols=import-dynamic 2>&1 | FileCheck -check-prefix=ERRNOPIC %s
88+
# RUN: not wasm-ld %t/main.o -o %t5.wasm --experimental-pic --unresolved-symbols=import-dynamic 2>&1 | FileCheck -check-prefix=ERRNOPIC %s
8989
# ERRNOPIC: relocation R_WASM_MEMORY_ADDR_SLEB cannot be used against symbol `undef_data`; recompile with -fPIC
9090
# ERRNOPIC: relocation R_WASM_TABLE_INDEX_SLEB cannot be used against symbol `undef_func`; recompile with -fPIC
9191

‎lld/wasm/Config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ struct Configuration {
6969
bool relocatable;
7070
bool saveTemps;
7171
bool shared;
72+
bool shlibSigCheck;
7273
bool stripAll;
7374
bool stripDebug;
7475
bool stackFirst;

‎lld/wasm/Driver.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,7 @@ static void readConfigs(opt::InputArgList &args) {
532532
config->saveTemps = args.hasArg(OPT_save_temps);
533533
config->searchPaths = args::getStrings(args, OPT_library_path);
534534
config->shared = args.hasArg(OPT_shared);
535+
config->shlibSigCheck = !args.hasArg(OPT_no_shlib_sigcheck);
535536
config->stripAll = args.hasArg(OPT_strip_all);
536537
config->stripDebug = args.hasArg(OPT_strip_debug);
537538
config->stackFirst = args.hasArg(OPT_stack_first);

‎lld/wasm/InputFiles.cpp

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ uint64_t ObjFile::calcNewValue(const WasmRelocation &reloc, uint64_t tombstone,
175175
case R_WASM_MEMORY_ADDR_TLS_SLEB:
176176
case R_WASM_MEMORY_ADDR_TLS_SLEB64:
177177
case R_WASM_MEMORY_ADDR_LOCREL_I32: {
178-
if (isa<UndefinedData>(sym) || sym->isUndefWeak())
178+
if (isa<UndefinedData>(sym) || sym->isShared() || sym->isUndefWeak())
179179
return 0;
180180
auto D = cast<DefinedData>(sym);
181181
uint64_t value = D->getVA() + reloc.Addend;
@@ -388,7 +388,8 @@ static bool shouldMerge(const WasmSegment &seg) {
388388
}
389389

390390
void ObjFile::parseLazy() {
391-
LLVM_DEBUG(dbgs() << "ObjFile::parseLazy: " << toString(this) << "\n");
391+
LLVM_DEBUG(dbgs() << "ObjFile::parseLazy: " << toString(this) << " "
392+
<< wasmObj.get() << "\n");
392393
for (const SymbolRef &sym : wasmObj->symbols()) {
393394
const WasmSymbol &wasmSym = wasmObj->getWasmSymbol(sym.getRawDataRefImpl());
394395
if (!wasmSym.isDefined())
@@ -403,21 +404,55 @@ void ObjFile::parseLazy() {
403404
}
404405

405406
ObjFile::ObjFile(MemoryBufferRef m, StringRef archiveName, bool lazy)
406-
: InputFile(ObjectKind, m) {
407+
: WasmFileBase(ObjectKind, m) {
407408
this->lazy = lazy;
408409
this->archiveName = std::string(archiveName);
409410

410411
// If this isn't part of an archive, it's eagerly linked, so mark it live.
411412
if (archiveName.empty())
412413
markLive();
414+
}
415+
416+
void SharedFile::parse() {
417+
assert(wasmObj->isSharedObject());
418+
419+
for (const SymbolRef &sym : wasmObj->symbols()) {
420+
const WasmSymbol &wasmSym = wasmObj->getWasmSymbol(sym.getRawDataRefImpl());
421+
if (wasmSym.isDefined()) {
422+
StringRef name = wasmSym.Info.Name;
423+
// Certain shared library exports are known to be DSO-local so we
424+
// don't want to add them to the symbol table.
425+
// TODO(sbc): Instead of hardcoding these here perhaps we could add
426+
// this as extra metadata in the `dylink` section.
427+
if (name == "__wasm_apply_data_relocs" || name == "__wasm_call_ctors" ||
428+
name.starts_with("__start_") || name.starts_with("__stop_"))
429+
continue;
430+
uint32_t flags = wasmSym.Info.Flags;
431+
Symbol *s;
432+
LLVM_DEBUG(dbgs() << "shared symbol: " << name << "\n");
433+
switch (wasmSym.Info.Kind) {
434+
case WASM_SYMBOL_TYPE_FUNCTION:
435+
s = symtab->addSharedFunction(name, flags, this, wasmSym.Signature);
436+
break;
437+
case WASM_SYMBOL_TYPE_DATA:
438+
s = symtab->addSharedData(name, flags, this);
439+
break;
440+
default:
441+
continue;
442+
}
443+
symbols.push_back(s);
444+
}
445+
}
446+
}
413447

448+
WasmFileBase::WasmFileBase(Kind k, MemoryBufferRef m) : InputFile(k, m) {
449+
// Parse a memory buffer as a wasm file.
450+
LLVM_DEBUG(dbgs() << "Reading object: " << toString(this) << "\n");
414451
std::unique_ptr<Binary> bin = CHECK(createBinary(mb), toString(this));
415452

416453
auto *obj = dyn_cast<WasmObjectFile>(bin.get());
417454
if (!obj)
418455
fatal(toString(this) + ": not a wasm file");
419-
if (!obj->isRelocatableObject())
420-
fatal(toString(this) + ": not a relocatable wasm file");
421456

422457
bin.release();
423458
wasmObj.reset(obj);
@@ -429,6 +464,9 @@ void ObjFile::parse(bool ignoreComdats) {
429464
// Parse a memory buffer as a wasm file.
430465
LLVM_DEBUG(dbgs() << "ObjFile::parse: " << toString(this) << "\n");
431466

467+
if (!wasmObj->isRelocatableObject())
468+
fatal(toString(this) + ": not a relocatable wasm file");
469+
432470
// Build up a map of function indices to table indices for use when
433471
// verifying the existing table index relocations
434472
uint32_t totalFunctions =

‎lld/wasm/InputFiles.h

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,26 @@ class InputFile {
8787
bool live;
8888
};
8989

90+
class WasmFileBase : public InputFile {
91+
public:
92+
explicit WasmFileBase(Kind k, MemoryBufferRef m);
93+
94+
// Returns the underlying wasm file.
95+
const WasmObjectFile *getWasmObj() const { return wasmObj.get(); }
96+
97+
protected:
98+
std::unique_ptr<WasmObjectFile> wasmObj;
99+
};
100+
90101
// .o file (wasm object file)
91-
class ObjFile : public InputFile {
102+
class ObjFile : public WasmFileBase {
92103
public:
93104
ObjFile(MemoryBufferRef m, StringRef archiveName, bool lazy = false);
94105
static bool classof(const InputFile *f) { return f->kind() == ObjectKind; }
95106

96107
void parse(bool ignoreComdats = false);
97108
void parseLazy();
98109

99-
// Returns the underlying wasm file.
100-
const WasmObjectFile *getWasmObj() const { return wasmObj.get(); }
101-
102110
uint32_t calcNewIndex(const WasmRelocation &reloc) const;
103111
uint64_t calcNewValue(const WasmRelocation &reloc, uint64_t tombstone,
104112
const InputChunk *chunk) const;
@@ -139,14 +147,15 @@ class ObjFile : public InputFile {
139147

140148
bool isExcludedByComdat(const InputChunk *chunk) const;
141149
void addLegacyIndirectFunctionTableIfNeeded(uint32_t tableSymbolCount);
142-
143-
std::unique_ptr<WasmObjectFile> wasmObj;
144150
};
145151

146152
// .so file.
147-
class SharedFile : public InputFile {
153+
class SharedFile : public WasmFileBase {
148154
public:
149-
explicit SharedFile(MemoryBufferRef m) : InputFile(SharedKind, m) {}
155+
explicit SharedFile(MemoryBufferRef m) : WasmFileBase(SharedKind, m) {}
156+
157+
void parse();
158+
150159
static bool classof(const InputFile *f) { return f->kind() == SharedKind; }
151160
};
152161

0 commit comments

Comments
 (0)