[WebAssembly] Fix nit from PR 145829

Author: badumbatish

llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp

@@ -343,19 +343,19 @@ bool WebAssemblyDAGToDAGISel::SelectAddrAddOperands(MVT OffsetType, SDValue N,
   if (N.getOpcode() == ISD::ADD && !N.getNode()->getFlags().hasNoUnsignedWrap())
     return false;
 
-  // Folds constants in an add into the offset.
   for (size_t i = 0; i < 2; ++i) {
     SDValue Op = N.getOperand(i);
     SDValue OtherOp = N.getOperand(i == 0 ? 1 : 0);
 
+    // Folds constants in an add into the offset.
     if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Op)) {
       Offset =
           CurDAG->getTargetConstant(CN->getZExtValue(), SDLoc(N), OffsetType);
       Addr = OtherOp;
       return true;
     }
 
-    // Fold Add of Global Address straight into load
+    // Fold target global addresses into the offset.
     if (Op.getOpcode() == WebAssemblyISD::Wrapper)
       Op = Op.getOperand(0);
 

llvm/test/CodeGen/WebAssembly/exception-legacy.ll

@@ -34,7 +34,7 @@ define void @throw(ptr %p) {
 ; CHECK:       call      foo
 ; CHECK:     catch     $[[EXN:[0-9]+]]=, __cpp_exception
 ; CHECK:       global.set  __stack_pointer
-; CHECK:       i32.{{store|const}} {{.*}} 4
+; CHECK:    i32.store __wasm_lpad_context
 ; CHECK:       call       $drop=, _Unwind_CallPersonality, $[[EXN]]
 ; CHECK:       block
 ; CHECK:         br_if     0

llvm/test/CodeGen/WebAssembly/offset.ll

@@ -60,28 +60,26 @@ define i32 @load_i32_with_folded_gep_offset_nuw(ptr %p) {
   ret i32 %t
 }
 
-@global_data = hidden local_unnamed_addr global [12 x i8] c"Hello world\00", align 1
-
-define hidden signext i8 @global_load_i32_with_folded_gep_offset_nonconst_nuw(i32 noundef %idx) local_unnamed_addr {
-; CHECK-LABEL: global_load_i32_with_folded_gep_offset_nonconst_nuw:
-; CHECK:         .functype global_load_i32_with_folded_gep_offset_nonconst_nuw (i32) -> (i32)
-; CHECK:    i32.load8_s $push0=, global_data($0)
-; CHECK:    return $pop0
-entry:
-  %arrayidx = getelementptr inbounds nuw [12 x i8], ptr @global_data, i32 0, i32 %idx
-  %0 = load i8, ptr %arrayidx, align 1
-  ret i8 %0
+@global_data = external global i32
+
+define i32 @load_i32_global_with_folded_gep_offset_nonconst_nuw(i32 %idx) {
+; CHECK-LABEL: load_i32_global_with_folded_gep_offset_nonconst_nuw:
+; CHECK:    i32.const $push0=, 2
+; CHECK-NEXT:    i32.shl $push1=, $0, $pop0
+; CHECK-NOT:     i32.add
+; CHECK-NEXT:    i32.load $push2=, global_data($pop1)
+  %s = getelementptr nuw i32, ptr @global_data, i32 %idx
+  %t = load i32, ptr %s
+  ret i32 %t
 }
 
-define hidden signext i8 @global_load_i32_with_folded_gep_offset_const_nuw() local_unnamed_addr {
-; CHECK-LABEL: global_load_i32_with_folded_gep_offset_const_nuw:
-; CHECK:         .functype global_load_i32_with_folded_gep_offset_const_nuw () -> (i32)
-; CHECK:    i32.const $push0=, 0
-; CHECK:    i32.load8_s $push1=, global_data+2($pop0)
-; CHECK:    return $pop1
+define i32 @load_i32_global_with_folded_gep_offset_const_nuw() {
+; CHECK-LABEL: load_i32_global_with_folded_gep_offset_const_nuw:
+; CHECK:    i32.const $push0=, 8
+; CHECK-NEXT:    i32.load $push1=, global_data($pop0)
 entry:
-  %0 = load i8, ptr getelementptr inbounds nuw (i8, ptr @global_data, i32 2), align 1
-  ret i8 %0
+  %t = load i32, ptr getelementptr nuw (i32, ptr @global_data, i32 2)
+  ret i32 %t
 }