[WebAssembly] Add guard for global folding

Author: badumbatish

llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp

@@ -356,13 +356,15 @@ bool WebAssemblyDAGToDAGISel::SelectAddrAddOperands(MVT OffsetType, SDValue N,
     }
 
     // Fold target global addresses into the offset.
-    if (Op.getOpcode() == WebAssemblyISD::Wrapper)
-      Op = Op.getOperand(0);
-
-    if (Op.getOpcode() == ISD::TargetGlobalAddress) {
-      Addr = OtherOp;
-      Offset = Op;
-      return true;
+    if (!TM.isPositionIndependent()) {
+      if (Op.getOpcode() == WebAssemblyISD::Wrapper)
+        Op = Op.getOperand(0);
+
+      if (Op.getOpcode() == ISD::TargetGlobalAddress) {
+        Addr = OtherOp;
+        Offset = Op;
+        return true;
+      }
     }
   }
   return false;

llvm/test/CodeGen/WebAssembly/address-offsets.ll

@@ -12,8 +12,8 @@ define i32 @load_test0() {
 ; CHECK-LABEL: load_test0:
 ; CHECK:         .functype load_test0 () -> (i32)
 ; CHECK-NEXT:  # %bb.0:
-; CHECK-NEXT:    i32.const $push0=, 40
-; CHECK-NEXT:    i32.load $push1=, g@GOT($pop0)
+; CHECK-NEXT:    global.get $push0=, g@GOT
+; CHECK-NEXT:    i32.load $push1=, 40($pop0)
 ; CHECK-NEXT:    return $pop1
   %t = load i32, ptr getelementptr inbounds ([0 x i32], ptr @g, i32 0, i32 10), align 4
   ret i32 %t
@@ -395,8 +395,8 @@ define void @store_test0(i32 %i) {
 ; CHECK-LABEL: store_test0:
 ; CHECK:         .functype store_test0 (i32) -> ()
 ; CHECK-NEXT:  # %bb.0:
-; CHECK-NEXT:    i32.const $push0=, 40
-; CHECK-NEXT:    i32.store g@GOT($pop0), $0
+; CHECK-NEXT:    global.get $push0=, g@GOT
+; CHECK-NEXT:    i32.store 40($pop0), $0
 ; CHECK-NEXT:    return
   store i32 %i, ptr getelementptr inbounds ([0 x i32], ptr @g, i32 0, i32 10), align 4
   ret void

llvm/test/CodeGen/WebAssembly/eh-lsda.ll

@@ -73,10 +73,11 @@ try.cont:                                         ; preds = %entry, %catch.start
 ; In case of PIC, we make GCC_except_table symbols a relative on based on
 ; __memory_base.
 ; PIC:        global.get  $push[[CONTEXT:.*]]=, __wasm_lpad_context@GOT
+; PIC-NEXT: local.tee $push{{.*}}=, $[[CONTEXT_LOCAL:.*]]=, $pop[[CONTEXT]]
 ; PIC:        global.get  $push[[MEMORY_BASE:.*]]=, __memory_base
 ; PIC-NEXT:   i[[PTR]].const  $push[[EXCEPT_TABLE_REL:.*]]=, GCC_except_table1@MBREL
 ; PIC-NEXT:   i[[PTR]].add   $push[[EXCEPT_TABLE:.*]]=, $pop[[MEMORY_BASE]], $pop[[EXCEPT_TABLE_REL]]
-; PIC-NEXT:   i[[PTR]].store  __wasm_lpad_context@GOT(${{.*}}), $pop[[EXCEPT_TABLE]]
+; PIC-NEXT: i[[PTR]].store {{[48]}}($[[CONTEXT_LOCAL]]), $pop[[EXCEPT_TABLE]]
 
 ; CHECK: .section  .rodata.gcc_except_table,"",@
 ; CHECK-NEXT:   .p2align  2