diff options
| -rw-r--r-- | lld/test/wasm/archive-weak-undefined.ll | 26 | ||||
| -rw-r--r-- | lld/wasm/InputFiles.cpp | 2 |
2 files changed, 24 insertions, 4 deletions
diff --git a/lld/test/wasm/archive-weak-undefined.ll b/lld/test/wasm/archive-weak-undefined.ll index 0285724e..25afcca 100644 --- a/lld/test/wasm/archive-weak-undefined.ll +++ b/lld/test/wasm/archive-weak-undefined.ll @@ -1,19 +1,39 @@ +; Test that weak undefined symbols do not fetch members from archive files. ; RUN: llc -filetype=obj %s -o %t.o -; RUN: llc -filetype=obj %S/Inputs/ret32.ll -o %t.a1.o +; RUN: llc -filetype=obj %S/Inputs/ret32.ll -o %t.ret32.o +; RUN: llc -filetype=obj %S/Inputs/hello.ll -o %t.hello.o ; RUN: rm -f %t.a -; RUN: llvm-ar rcs %t.a %t.a1.o +; RUN: llvm-ar rcs %t.a %t.ret32.o %t.hello.o + ; RUN: wasm-ld %t.o %t.a -o %t.wasm ; RUN: obj2yaml %t.wasm | FileCheck %s +; RUN: wasm-ld -u hello_str %t.o %t.a -o %t2.wasm +; RUN: obj2yaml %t2.wasm | FileCheck %s -check-prefix=CHECK-DATA + target triple = "wasm32-unknown-unknown" +; Weak external function symbol declare extern_weak i32 @ret32() +; Weak external data symbol +@hello_str = extern_weak global i8*, align 4 + define void @_start() { -entry: + br i1 icmp ne (i8** @hello_str, i8** null), label %if.then, label %if.end + +if.then: %call1 = call i32 @ret32() + br label %if.end + +if.end: ret void } +; Ensure we have no data section. If we do, would mean that hello_str was +; pulled out of the library. +; CHECK-NOT: Type: DATA +; CHECK-DATA: Type: DATA + ; CHECK: Name: 'undefined:ret32' ; CHECK-NOT: Name: ret32 diff --git a/lld/wasm/InputFiles.cpp b/lld/wasm/InputFiles.cpp index 33ae332..8e36fc9 100644 --- a/lld/wasm/InputFiles.cpp +++ b/lld/wasm/InputFiles.cpp @@ -173,7 +173,7 @@ uint32_t ObjFile::calcNewValue(const WasmRelocation &reloc) const { case R_WASM_MEMORY_ADDR_I32: case R_WASM_MEMORY_ADDR_LEB: case R_WASM_MEMORY_ADDR_REL_SLEB: - if (isa<UndefinedData>(sym)) + if (isa<UndefinedData>(sym) || sym->isUndefWeak()) return 0; return cast<DefinedData>(sym)->getVirtualAddress() + reloc.Addend; case R_WASM_TYPE_INDEX_LEB: |