wasm-emscripten-finalize: Handle relocatable code in AsmConstWalker (#2035)

When replacing the first argument to an asm call, allow more complex
expressions for expressing the address.

This fixes the case where the first argument might be the result
of adding a constant to __memory_base.

2 files changed, 7 insertions, 18 deletions

diff --git a/test/lld/em_asm_O0.wast.out b/test/lld/em_asm_O0.wast.out
index d194c8185..cb5cc1961 100644
--- a/test/lld/em_asm_O0.wast.out
+++ b/test/lld/em_asm_O0.wast.out
@@ -34,16 +34,16 @@
    )
   )
   (local.set $t1
-   (i32.const 2)
+   (i32.const 621)
   )
   (local.set $t2
-   (i32.const 1)
+   (i32.const 601)
   )
   (drop
    (call $emscripten_asm_const_ii
-    (local.get $t1)
+    (i32.const 2)
     (call $emscripten_asm_const_iii
-     (local.get $t2)
+     (i32.const 1)
      (i32.const 13)
      (i32.const 27)
     )
diff --git a/test/lld/em_asm_shared.wast.out b/test/lld/em_asm_shared.wast.out
index 220a10aca..3a5268380 100644
--- a/test/lld/em_asm_shared.wast.out
+++ b/test/lld/em_asm_shared.wast.out
@@ -48,12 +48,7 @@
   )
   (drop
    (call $emscripten_asm_const_iii
-    (i32.add
-     (local.tee $1
-      (global.get $gimport$3)
-     )
-     (i32.const 0)
-    )
+    (i32.const 0)
     (i32.add
      (local.get $0)
      (i32.const 24)
@@ -80,10 +75,7 @@
    )
    (local.tee $2
     (call $emscripten_asm_const_iii
-     (i32.add
-      (local.get $1)
-      (i32.const 1)
-     )
+     (i32.const 1)
      (i32.add
       (local.get $0)
       (i32.const 24)
@@ -101,10 +93,7 @@
   )
   (drop
    (call $emscripten_asm_const_iii
-    (i32.add
-     (local.get $1)
-     (i32.const 2)
-    )
+    (i32.const 2)
     (i32.add
      (local.get $0)
      (i32.const 24)