[PATCH] D60992: [WebAssembly] Fix typo in relocation checking
Phabricator via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Apr 23 07:47:36 PDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rL358995: [WebAssembly] Fix typo in relocation checking (authored by sbc, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D60992?vs=196247&id=196248#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D60992/new/
https://reviews.llvm.org/D60992
Files:
lld/trunk/test/wasm/pie.ll
lld/trunk/wasm/InputFiles.cpp
Index: lld/trunk/test/wasm/pie.ll
===================================================================
--- lld/trunk/test/wasm/pie.ll
+++ lld/trunk/test/wasm/pie.ll
@@ -0,0 +1,53 @@
+; RUN: llc -relocation-model=pic -filetype=obj %s -o %t.o
+; RUN: wasm-ld --no-gc-sections --allow-undefined -pie -o %t.wasm %t.o
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+target triple = "wasm32-unknown-unknown"
+
+ at data = global i32 2, align 4
+ at data_external = external global i32
+ at indirect_func = local_unnamed_addr global i32 ()* @foo, align 4
+
+ at data_addr = local_unnamed_addr global i32* @data, align 4
+ at data_addr_external = local_unnamed_addr global i32* @data_external, align 4
+
+define i32 @foo() {
+entry:
+ ; To ensure we use __stack_pointer
+ %ptr = alloca i32
+ %0 = load i32, i32* @data, align 4
+ %1 = load i32 ()*, i32 ()** @indirect_func, align 4
+ call i32 %1()
+ ret i32 %0
+}
+
+define default i32** @get_data_address() {
+entry:
+ ret i32** @data_addr_external
+}
+
+define void @_start() {
+ ret void
+}
+
+; CHECK: - Type: IMPORT
+; CHECK-NEXT: Imports:
+; CHECK-NEXT: - Module: env
+; CHECK-NEXT: Field: __indirect_function_table
+; CHECK-NEXT: Kind: TABLE
+; CHECK-NEXT: Table:
+; CHECK-NEXT: ElemType: FUNCREF
+; CHECK-NEXT: Limits:
+; CHECK-NEXT: Initial: 0x00000001
+; CHECK-NEXT: - Module: env
+; CHECK-NEXT: Field: __memory_base
+; CHECK-NEXT: Kind: GLOBAL
+; CHECK-NEXT: GlobalType: I32
+; CHECK-NEXT: GlobalMutable: false
+; CHECK-NEXT: - Module: env
+; CHECK-NEXT: Field: __table_base
+; CHECK-NEXT: Kind: GLOBAL
+; CHECK-NEXT: GlobalType: I32
+; CHECK-NEXT: GlobalMutable: false
+
+
Index: lld/trunk/wasm/InputFiles.cpp
===================================================================
--- lld/trunk/wasm/InputFiles.cpp
+++ lld/trunk/wasm/InputFiles.cpp
@@ -155,7 +155,9 @@
if (isa<DataSymbol>(Sym) && Sym->isUndefined()) {
if (Sym->isWeak() || Config->Relocatable)
return 0;
- if (Config->Shared && Reloc.Type == R_WASM_MEMORY_ADDR_I32)
+ // R_WASM_MEMORY_ADDR_I32 relocations in PIC code are turned into runtime
+ // fixups in __wasm_apply_relocs
+ if (Config->Pic && Reloc.Type == R_WASM_MEMORY_ADDR_I32)
return 0;
if (Reloc.Type != R_WASM_GLOBAL_INDEX_LEB) {
llvm_unreachable(
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60992.196248.patch
Type: text/x-patch
Size: 2558 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190423/ccaf040c/attachment.bin>
More information about the llvm-commits
mailing list