Remove now-redundant stack pointer manipulation passes (#3251)

The use of these passes was removed on the emscripten side
in https://github.com/emscripten-core/emscripten/pull/12536.

8 files changed, 14 insertions, 21 deletions

diff --git a/test/lld/em_asm_shared.wat.out b/test/lld/em_asm_shared.wat.out
index cf5e9f65f..ddf87cf9b 100644
--- a/test/lld/em_asm_shared.wat.out
+++ b/test/lld/em_asm_shared.wat.out
@@ -1,17 +1,15 @@
 (module
- (type $none_=>_i32 (func (result i32)))
  (type $none_=>_none (func))
- (type $i32_=>_none (func (param i32)))
+ (type $none_=>_i32 (func (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "memory" (memory $mimport$0 0))
  (data (global.get $gimport$3) "{ Module.print(\"Hello world\"); }\00\00{ return $0 + $1; }\00ii\00{ Module.print(\"Got \" + $0); }\00i\00")
  (import "env" "__indirect_function_table" (table $timport$1 0 funcref))
+ (import "env" "__stack_pointer" (global $gimport$2 (mut i32)))
  (import "env" "__memory_base" (global $gimport$3 i32))
  (import "env" "__table_base" (global $gimport$4 i32))
  (import "env" "emscripten_asm_const_int" (func $emscripten_asm_const_int (param i32 i32 i32) (result i32)))
- (import "env" "stackSave" (func $stackSave (result i32)))
- (import "env" "stackRestore" (func $stackRestore (param i32)))
  (import "env" "g$_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJEEE6bufferE" (func $g$_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJEEE6bufferE (result i32)))
  (import "env" "g$_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiiEEE6bufferE" (func $g$_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiiEEE6bufferE (result i32)))
  (import "env" "g$_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiEEE6bufferE" (func $g$_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiEEE6bufferE (result i32)))
@@ -36,10 +34,10 @@
  (func $__original_main (result i32)
   (local $0 i32)
   (local $1 i32)
-  (call $stackRestore
+  (global.set $gimport$2
    (local.tee $0
     (i32.sub
-     (call $stackSave)
+     (global.get $gimport$2)
      (i32.const 32)
     )
    )
@@ -84,7 +82,7 @@
     (local.get $0)
    )
   )
-  (call $stackRestore
+  (global.set $gimport$2
    (i32.add
     (local.get $0)
     (i32.const 32)
@@ -123,13 +121,12 @@
   "tableSize": 0,
   "declares": [
     "emscripten_asm_const_int",
-    "stackSave",
-    "stackRestore",
     "g$_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJEEE6bufferE",
     "g$_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiiEEE6bufferE",
     "g$_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiEEE6bufferE"
   ],
   "externs": [
+    "___stack_pointer",
     "___memory_base",
     "___table_base"
   ],
diff --git a/test/lld/main_module.wat.out b/test/lld/main_module.wat.out
index 290e52d06..98db00719 100644
--- a/test/lld/main_module.wat.out
+++ b/test/lld/main_module.wat.out
@@ -5,7 +5,7 @@
  (import "env" "memory" (memory $0 0))
  (data (global.get $gimport$2) "Hello, world\00\00\00\00\00\00\00\00\00\00\00\00")
  (import "env" "__indirect_function_table" (table $timport$1 0 funcref))
- (import "env" "__stack_pointer" (global $sp_import i32))
+ (import "env" "__stack_pointer" (global $sp (mut i32)))
  (import "env" "__memory_base" (global $gimport$2 i32))
  (import "env" "__table_base" (global $gimport$3 i32))
  (import "env" "puts" (func $puts (param i32) (result i32)))
@@ -18,7 +18,6 @@
  (global $global$0 i32 (i32.const 16))
  (global $global$1 i32 (i32.const 20))
  (global $global i32 (i32.const 42))
- (global $sp (mut i32) (global.get $sp_import))
  (export "__wasm_call_ctors" (func $__wasm_call_ctors))
  (export "_Z13print_messagev" (func $print_message\28\29))
  (export "ptr_puts" (global $global$0))
diff --git a/test/lld/main_module_table.wat.out b/test/lld/main_module_table.wat.out
index 740ab5317..62ba29010 100644
--- a/test/lld/main_module_table.wat.out
+++ b/test/lld/main_module_table.wat.out
@@ -1,11 +1,10 @@
 (module
  (type $none_=>_none (func))
  (type $none_=>_i32 (func (result i32)))
- (import "env" "__stack_pointer" (global $sp_import i32))
+ (import "env" "__stack_pointer" (global $sp (mut i32)))
  (import "env" "fp$__stdio_write$v" (func $fp$__stdio_write$v (result i32)))
  (global $gimport$9 (mut i32) (i32.const 0))
  (global $global i32 (i32.const 42))
- (global $sp (mut i32) (global.get $sp_import))
  (export "__stdio_write" (func $__stdio_write))
  (export "__data_end" (global $global))
  (export "__assign_got_enties" (func $__assign_got_enties))
diff --git a/test/lld/main_module_table_2.wat.out b/test/lld/main_module_table_2.wat.out
index 201a58fa4..1a0cceed6 100644
--- a/test/lld/main_module_table_2.wat.out
+++ b/test/lld/main_module_table_2.wat.out
@@ -2,11 +2,10 @@
  (type $none_=>_none (func))
  (type $none_=>_i32 (func (result i32)))
  (import "env" "table" (table $timport$9 1 funcref))
- (import "env" "__stack_pointer" (global $sp_import i32))
+ (import "env" "__stack_pointer" (global $sp (mut i32)))
  (import "env" "fp$__stdio_write$v" (func $fp$__stdio_write$v (result i32)))
  (global $gimport$9 (mut i32) (i32.const 0))
  (global $global i32 (i32.const 42))
- (global $sp (mut i32) (global.get $sp_import))
  (export "__stdio_write" (func $__stdio_write))
  (export "__data_end" (global $global))
  (export "__assign_got_enties" (func $__assign_got_enties))
diff --git a/test/lld/main_module_table_3.wat.out b/test/lld/main_module_table_3.wat.out
index 201a58fa4..1a0cceed6 100644
--- a/test/lld/main_module_table_3.wat.out
+++ b/test/lld/main_module_table_3.wat.out
@@ -2,11 +2,10 @@
  (type $none_=>_none (func))
  (type $none_=>_i32 (func (result i32)))
  (import "env" "table" (table $timport$9 1 funcref))
- (import "env" "__stack_pointer" (global $sp_import i32))
+ (import "env" "__stack_pointer" (global $sp (mut i32)))
  (import "env" "fp$__stdio_write$v" (func $fp$__stdio_write$v (result i32)))
  (global $gimport$9 (mut i32) (i32.const 0))
  (global $global i32 (i32.const 42))
- (global $sp (mut i32) (global.get $sp_import))
  (export "__stdio_write" (func $__stdio_write))
  (export "__data_end" (global $global))
  (export "__assign_got_enties" (func $__assign_got_enties))
diff --git a/test/lld/main_module_table_4.wat.out b/test/lld/main_module_table_4.wat.out
index ab25bc110..35f5e2ea1 100644
--- a/test/lld/main_module_table_4.wat.out
+++ b/test/lld/main_module_table_4.wat.out
@@ -2,12 +2,11 @@
  (type $none_=>_none (func))
  (type $none_=>_i32 (func (result i32)))
  (import "env" "table" (table $timport$9 1 funcref))
- (import "env" "__stack_pointer" (global $sp_import i32))
+ (import "env" "__stack_pointer" (global $sp (mut i32)))
  (import "env" "__table_base" (global $tb i32))
  (import "env" "fp$__stdio_write$v" (func $fp$__stdio_write$v (result i32)))
  (global $gimport$9 (mut i32) (i32.const 0))
  (global $global i32 (i32.const 42))
- (global $sp (mut i32) (global.get $sp_import))
  (export "__stdio_write" (func $__stdio_write))
  (export "__data_end" (global $global))
  (export "__assign_got_enties" (func $__assign_got_enties))
diff --git a/test/lld/main_module_table_5.wat.out b/test/lld/main_module_table_5.wat.out
index bdc75b825..a2526fc48 100644
--- a/test/lld/main_module_table_5.wat.out
+++ b/test/lld/main_module_table_5.wat.out
@@ -4,12 +4,11 @@
  (type $none_=>_i32 (func (result i32)))
  (import "env" "table" (table $timport$9 1 funcref))
  (elem (global.get $tb) $other $stuff)
- (import "env" "__stack_pointer" (global $sp_import i32))
+ (import "env" "__stack_pointer" (global $sp (mut i32)))
  (import "env" "__table_base" (global $tb i32))
  (import "env" "fp$__stdio_write$v" (func $fp$__stdio_write$v (result i32)))
  (global $gimport$9 (mut i32) (i32.const 0))
  (global $global i32 (i32.const 42))
- (global $sp (mut i32) (global.get $sp_import))
  (export "__stdio_write" (func $__stdio_write))
  (export "__data_end" (global $global))
  (export "dynCall_v" (func $dynCall_v))
diff --git a/test/lld/shared_add_to_table.wasm.out b/test/lld/shared_add_to_table.wasm.out
index c7a39b1bf..22a608f1b 100644
--- a/test/lld/shared_add_to_table.wasm.out
+++ b/test/lld/shared_add_to_table.wasm.out
@@ -6,6 +6,7 @@
  (import "env" "memory" (memory $mimport$0 0))
  (data (global.get $gimport$1) "*\00\00\00")
  (import "env" "__indirect_function_table" (table $timport$0 0 funcref))
+ (import "env" "__stack_pointer" (global $gimport$0 (mut i32)))
  (import "env" "__memory_base" (global $gimport$1 i32))
  (import "env" "__table_base" (global $gimport$2 i32))
  (import "env" "_Z16waka_func_theirsi" (func $waka_func_theirs\28int\29 (param i32) (result i32)))
@@ -102,6 +103,7 @@
     "fp$_Z14waka_func_minei$ii"
   ],
   "externs": [
+    "___stack_pointer",
     "___memory_base",
     "___table_base"
   ],