[lld][WebAssembly] Fix static linking of -fPIC code with external undefined data
Reviewers: ruiu, sbc100
Reviewed By: sbc100
Subscribers: dschuff, jgravelle-google, aheejin, sunfish, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D68991
git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@374913 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/wasm/pic-static.ll b/test/wasm/pic-static.ll
index d13d74d..83752f3 100644
--- a/test/wasm/pic-static.ll
+++ b/test/wasm/pic-static.ll
@@ -12,6 +12,7 @@
declare i32 @missing_function(float)
@global_float = global float 1.0
@hidden_float = hidden global float 2.0
+@missing_float = extern_weak global float
@ret32_ptr = global i32 (float)* @ret32, align 4
@@ -27,6 +28,10 @@
ret i32 ()* @hidden_func;
}
+define float* @getaddr_missing_float() {
+ ret float* @missing_float
+}
+
define hidden i32 @hidden_func() {
ret i32 1
}
@@ -83,16 +88,24 @@
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1
-; GOT.mem.global_float
+; GOT.mem.missing_float
; CHECK-NEXT: - Index: 4
; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST
+; CHECK-NEXT: Value: 0
+
+; GOT.mem.global_float
+; CHECK-NEXT: - Index: 5
+; CHECK-NEXT: Type: I32
+; CHECK-NEXT: Mutable: false
+; CHECK-NEXT: InitExpr:
+; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1024
; GOT.mem.ret32_ptr
-; CHECK-NEXT: - Index: 5
+; CHECK-NEXT: - Index: 6
; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr:
@@ -100,7 +113,7 @@
; CHECK-NEXT: Value: 1032
; __memory_base
-; CHECK-NEXT: - Index: 6
+; CHECK-NEXT: - Index: 7
; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr:
diff --git a/wasm/SyntheticSections.cpp b/wasm/SyntheticSections.cpp
index b00bd0c..30c1096 100644
--- a/wasm/SyntheticSections.cpp
+++ b/wasm/SyntheticSections.cpp
@@ -273,8 +273,12 @@
global.InitExpr.Opcode = WASM_OPCODE_I32_CONST;
if (auto *d = dyn_cast<DefinedData>(sym))
global.InitExpr.Value.Int32 = d->getVirtualAddress();
- else if (auto *f = cast<FunctionSymbol>(sym))
+ else if (auto *f = dyn_cast<FunctionSymbol>(sym))
global.InitExpr.Value.Int32 = f->getTableIndex();
+ else {
+ assert(isa<UndefinedData>(sym));
+ global.InitExpr.Value.Int32 = 0;
+ }
writeGlobal(os, global);
}
for (const DefinedData *sym : dataAddressGlobals) {
