1 files changed, 55 insertions, 31 deletions
diff --git a/test/unit.wast b/test/unit.wast
index 2e21d44dd..2df02df44 100644
--- a/test/unit.wast
+++ b/test/unit.wast
@@ -9,10 +9,10 @@
   (type $5 (func (result i32)))
   (type $6 (func (param i32) (result i32)))
   (type $7 (func (param f64) (result f64)))
-  (import $_emscripten_asm_const_vi "env" "_emscripten_asm_const_vi")
-  (import $f64-to-int "asm2wasm" "f64-to-int" (param f64) (result i32))
-  (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64))
-  (export "big_negative" $big_negative)
+  (import "env" "_emscripten_asm_const_vi" (func $_emscripten_asm_const_vi))
+  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
+  (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64)))
+  (export "big_negative" (func $big_negative))
   (table 10 anyfunc)
   (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
   (func $big_negative (type $FUNCSIG$v)
@@ -139,12 +139,14 @@
     )
   )
   (func $hexLiterals (type $FUNCSIG$v)
-    (i32.add
+    (drop
       (i32.add
-        (i32.const 0)
-        (i32.const 313249263)
+        (i32.add
+          (i32.const 0)
+          (i32.const 313249263)
+        )
+        (i32.const -19088752)
       )
-      (i32.const -19088752)
     )
   )
   (func $conversions (type $FUNCSIG$v)
@@ -176,11 +178,15 @@
     (set_local $J
       (f64.sub
         (block $block0
-          (f64.const 0.1)
+          (drop
+            (f64.const 0.1)
+          )
           (f64.const 5.1)
         )
         (block $block1
-          (f64.const 3.2)
+          (drop
+            (f64.const 3.2)
+          )
           (f64.const 4.2)
         )
       )
@@ -247,8 +253,8 @@
               )
               (br $label$break$Lout)
             )
-            (block $block0
-              (loop $while-out$10 $while-in$11
+            (block $while-out$10
+              (loop $while-in$11
                 (block $block1
                   (br $while-out$10)
                   (br $while-in$11)
@@ -257,8 +263,8 @@
               (br $label$break$Lout)
             )
           )
-          (block $block2
-            (loop $while-out$13 $while-in$14
+          (block $while-out$13
+            (loop $while-in$14
               (block $block3
                 (br $label$break$Lout)
                 (br $while-in$14)
@@ -302,14 +308,26 @@
     (local $y f32)
     (local $z f64)
     (block $block0
-      (f32.demote/f64
-        (get_local $z)
+      (drop
+        (f32.demote/f64
+          (get_local $z)
+        )
+      )
+      (drop
+        (get_local $y)
+      )
+      (drop
+        (f32.const 5)
+      )
+      (drop
+        (f32.const 0)
+      )
+      (drop
+        (f32.const 5)
+      )
+      (drop
+        (f32.const 0)
       )
-      (get_local $y)
-      (f32.const 5)
-      (f32.const 0)
-      (f32.const 5)
-      (f32.const 0)
     )
   )
   (func $negZero (type $4) (result f64)
@@ -360,6 +378,7 @@
         )
       )
       (call_indirect $FUNCSIG$vf
+        (get_local $x)
         (i32.add
           (i32.and
             (i32.const 1)
@@ -367,12 +386,12 @@
           )
           (i32.const 8)
         )
-        (get_local $x)
       )
     )
   )
   (func $cneg (type $FUNCSIG$vf) (param $x f32)
     (call_indirect $FUNCSIG$vf
+      (get_local $x)
       (i32.add
         (i32.and
           (i32.const 1)
@@ -380,17 +399,18 @@
         )
         (i32.const 8)
       )
-      (get_local $x)
     )
   )
   (func $___syscall_ret (type $FUNCSIG$v)
     (local $$0 i32)
-    (i32.gt_u
-      (i32.shr_u
-        (get_local $$0)
-        (i32.const 0)
+    (drop
+      (i32.gt_u
+        (i32.shr_u
+          (get_local $$0)
+          (i32.const 0)
+        )
+        (i32.const -4096)
       )
-      (i32.const -4096)
     )
   )
   (func $z (type $FUNCSIG$v)
@@ -401,14 +421,18 @@
   )
   (func $block_and_after (type $5) (result i32)
     (block $waka
-      (i32.const 1)
+      (drop
+        (i32.const 1)
+      )
       (br $waka)
     )
     (i32.const 0)
   )
   (func $loop-roundtrip (type $7) (param $0 f64) (result f64)
-    (loop $loop-out0 $loop-in1
-      (get_local $0)
+    (loop $loop-in1
+      (drop
+        (get_local $0)
+      )
       (get_local $0)
     )
   )