From: Sam Clegg <sbc@chromium.org>
Date: Tue, 23 Apr 2019 14:49:38 +0000 (+0000)
Subject: [WebAssembly] Fix typo in relocation checking
X-Git-Tag: llvmorg-10-init~7228
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99cf58339fceadee43ba3fdbf962a083cd5af6c4;p=platform%2Fupstream%2Fllvm.git

[WebAssembly] Fix typo in relocation checking

Runtime relocation are generated for relocations of type
R_WASM_MEMORY_ADDR_I32 when in PIC mode (either -shared or -pie).

Followup on https://reviews.llvm.org/D60882.

Differential Revision: https://reviews.llvm.org/D60992

llvm-svn: 358995
---

diff --git a/lld/test/wasm/pie.ll b/lld/test/wasm/pie.ll
new file mode 100644
index 0000000..06f95bc
--- /dev/null
+++ b/lld/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"
+
+@data = global i32 2, align 4
+@data_external = external global i32
+@indirect_func = local_unnamed_addr global i32 ()* @foo, align 4
+
+@data_addr = local_unnamed_addr global i32* @data, align 4
+@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
+
+
diff --git a/lld/wasm/InputFiles.cpp b/lld/wasm/InputFiles.cpp
index 807651a..b62b1fe 100644
--- a/lld/wasm/InputFiles.cpp
+++ b/lld/wasm/InputFiles.cpp
@@ -155,7 +155,9 @@ uint32_t ObjFile::calcNewValue(const WasmRelocation &Reloc) const {
     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(