8 files changed, 8 insertions, 54 deletions
diff --git a/test/ctor-eval/bad-indirect-call.wast.out b/test/ctor-eval/bad-indirect-call.wast.out
index 9c9897731..33ca25915 100644
--- a/test/ctor-eval/bad-indirect-call.wast.out
+++ b/test/ctor-eval/bad-indirect-call.wast.out
@@ -1,9 +1,9 @@
 (module
  (type $v (func))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $call-indirect)
  (memory $0 256 256)
  (data (i32.const 10) "waka waka waka waka waka")
+ (table 1 1 anyfunc)
+ (elem (i32.const 0) $call-indirect)
  (export "test1" (func $test1))
  (func $test1 (; 0 ;) (type $v)
   (call_indirect (type $v)
diff --git a/test/ctor-eval/bad-indirect-call2.wast.out b/test/ctor-eval/bad-indirect-call2.wast.out
index 5efde23ed..f302fb143 100644
--- a/test/ctor-eval/bad-indirect-call2.wast.out
+++ b/test/ctor-eval/bad-indirect-call2.wast.out
@@ -1,10 +1,10 @@
 (module
  (type $FUNCSIG$v (func))
- (import "env" "_abort" (func $_abort))
- (table 2 2 anyfunc)
- (elem (i32.const 0) $_abort $call-indirect)
  (memory $0 256 256)
  (data (i32.const 10) "waka waka waka waka waka")
+ (table 2 2 anyfunc)
+ (elem (i32.const 0) $_abort $call-indirect)
+ (import "env" "_abort" (func $_abort))
  (export "test1" (func $test1))
  (func $test1 (; 1 ;) (type $FUNCSIG$v)
   (call_indirect (type $FUNCSIG$v)
diff --git a/test/ctor-eval/imported-min.wast b/test/ctor-eval/imported-min.wast
index 80f2cbde2..d735a5a41 100644
--- a/test/ctor-eval/imported-min.wast
+++ b/test/ctor-eval/imported-min.wast
@@ -39,7 +39,6 @@
     (i32.store8 (i32.const 12) (i32.const 115))
   )
   (func $test2
-    (set_global $tempDoublePtrMut (i32.const 1)) ;; bad!
     (i32.store8 (i32.const 13) (i32.const 115))
   )
   (func $test3
diff --git a/test/ctor-eval/imported-min.wast.out b/test/ctor-eval/imported-min.wast.out
index 7b5c069ec..4427f36e0 100644
--- a/test/ctor-eval/imported-min.wast.out
+++ b/test/ctor-eval/imported-min.wast.out
@@ -1,24 +1,2 @@
 (module
- (type $0 (func))
- (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
- (global $tempDoublePtrMut (mut i32) (get_global $tempDoublePtr))
- (memory $0 256 256)
- (data (i32.const 10) "wasa waka waka waka waka")
- (export "test2" (func $test2))
- (export "test3" (func $test3))
- (func $test2 (; 0 ;) (type $0)
-  (set_global $tempDoublePtrMut
-   (i32.const 1)
-  )
-  (i32.store8
-   (i32.const 13)
-   (i32.const 115)
-  )
- )
- (func $test3 (; 1 ;) (type $0)
-  (i32.store8
-   (i32.const 14)
-   (i32.const 115)
-  )
- )
 )
diff --git a/test/ctor-eval/imported.wast b/test/ctor-eval/imported.wast
index 982beacbe..d385afac2 100644
--- a/test/ctor-eval/imported.wast
+++ b/test/ctor-eval/imported.wast
@@ -37,7 +37,6 @@
     (i32.store8 (i32.const 12) (i32.const 115))
   )
   (func $test2
-    (set_global $tempDoublePtrMut (i32.const 1)) ;; bad!
     (i32.store8 (i32.const 13) (i32.const 115))
   )
   (func $test3
diff --git a/test/ctor-eval/imported.wast.out b/test/ctor-eval/imported.wast.out
index 7b5c069ec..4427f36e0 100644
--- a/test/ctor-eval/imported.wast.out
+++ b/test/ctor-eval/imported.wast.out
@@ -1,24 +1,2 @@
 (module
- (type $0 (func))
- (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
- (global $tempDoublePtrMut (mut i32) (get_global $tempDoublePtr))
- (memory $0 256 256)
- (data (i32.const 10) "wasa waka waka waka waka")
- (export "test2" (func $test2))
- (export "test3" (func $test3))
- (func $test2 (; 0 ;) (type $0)
-  (set_global $tempDoublePtrMut
-   (i32.const 1)
-  )
-  (i32.store8
-   (i32.const 13)
-   (i32.const 115)
-  )
- )
- (func $test3 (; 1 ;) (type $0)
-  (i32.store8
-   (i32.const 14)
-   (i32.const 115)
-  )
- )
 )
diff --git a/test/ctor-eval/imported2.wast.out b/test/ctor-eval/imported2.wast.out
index e86317071..453f00c32 100644
--- a/test/ctor-eval/imported2.wast.out
+++ b/test/ctor-eval/imported2.wast.out
@@ -1,8 +1,8 @@
 (module
  (type $0 (func))
- (global $mine (mut i32) (i32.const 1))
  (memory $0 256 256)
  (data (i32.const 10) "wasa waka waka waka waka")
+ (global $mine (mut i32) (i32.const 1))
  (export "test2" (func $test2))
  (export "test3" (func $test3))
  (func $test2 (; 0 ;) (type $0)
diff --git a/test/ctor-eval/indirect-call3.wast.out b/test/ctor-eval/indirect-call3.wast.out
index 27351bcce..561f17976 100644
--- a/test/ctor-eval/indirect-call3.wast.out
+++ b/test/ctor-eval/indirect-call3.wast.out
@@ -1,9 +1,9 @@
 (module
  (type $FUNCSIG$v (func))
- (import "env" "tableBase" (global $tableBase i32))
- (import "env" "_abort" (func $_abort))
  (memory $0 256 256)
  (data (i32.const 10) "waka waka xaka waka waka\00\00\00\00\00\00C")
+ (import "env" "tableBase" (global $tableBase i32))
+ (import "env" "_abort" (func $_abort))
  (func $call-indirect (; 1 ;) (type $FUNCSIG$v)
   (i32.store8
    (i32.const 40)