Merge pull request #710 from WebAssembly/autodrop-fix

Autodrop fixes

11 files changed, 291 insertions, 59 deletions

diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt
index 28d7b759b..b7b4821ac 100644
--- a/test/example/c-api-kitchen-sink.txt
+++ b/test/example/c-api-kitchen-sink.txt
@@ -399,10 +399,12 @@ BinaryenFloat64: 4
             )
             (block
             )
-            (drop
-              (if
-                (i32.const 1)
+            (if
+              (i32.const 1)
+              (drop
                 (i32.const 2)
+              )
+              (drop
                 (i32.const 3)
               )
             )
@@ -1992,10 +1994,12 @@ int main() {
             )
             (block
             )
-            (drop
-              (if
-                (i32.const 1)
+            (if
+              (i32.const 1)
+              (drop
                 (i32.const 2)
+              )
+              (drop
                 (i32.const 3)
               )
             )
diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt
index f66b714eb..a6f6e0853 100644
--- a/test/example/c-api-kitchen-sink.txt.txt
+++ b/test/example/c-api-kitchen-sink.txt.txt
@@ -394,10 +394,12 @@
             )
             (block
             )
-            (drop
-              (if
-                (i32.const 1)
+            (if
+              (i32.const 1)
+              (drop
                 (i32.const 2)
+              )
+              (drop
                 (i32.const 3)
               )
             )
diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt
index f2aa8d0d9..f12054887 100644
--- a/test/passes/simplify-locals.txt
+++ b/test/passes/simplify-locals.txt
@@ -9,6 +9,7 @@
   (type $6 (func (param i32 i32 i32 i32 i32 i32)))
   (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
   (type $8 (func (param i32 i32)))
+  (type $9 (func (param i32 i32 i32) (result i32)))
   (import "env" "waka" (func $waka))
   (import "env" "waka_int" (func $waka_int (result i32)))
   (import "env" "i64sub" (func $_i64Subtract (param i32 i32 i32 i32) (result i32)))
@@ -735,4 +736,32 @@
     )
     (get_local $a)
   )
+  (func $drop-if-value (type $9) (param $x i32) (param $y i32) (param $z i32) (result i32)
+    (local $temp i32)
+    (drop
+      (if
+        (get_local $x)
+        (block $block53 i32
+          (nop)
+          (set_local $temp
+            (get_local $y)
+          )
+          (get_local $z)
+        )
+        (block $block54 i32
+          (nop)
+          (set_local $temp
+            (get_local $y)
+          )
+          (get_local $z)
+        )
+      )
+    )
+    (drop
+      (get_local $temp)
+    )
+    (return
+      (i32.const 0)
+    )
+  )
 )
diff --git a/test/passes/simplify-locals.wast b/test/passes/simplify-locals.wast
index 4fa345770..a998daf5f 100644
--- a/test/passes/simplify-locals.wast
+++ b/test/passes/simplify-locals.wast
@@ -775,4 +775,30 @@
     )
     (get_local $a)
   )
+  (func $drop-if-value (param $x i32) (param $y i32) (param $z i32) (result i32)
+    (local $temp i32)
+    (drop
+      (if
+        (get_local $x)
+        (block $block53 i32
+          (nop)
+          (set_local $temp
+            (get_local $y)
+          )
+          (get_local $z)
+        )
+        (block $block54 i32
+          (nop)
+          (set_local $temp
+            (get_local $y)
+          )
+          (get_local $z)
+        )
+      )
+    )
+    (drop (get_local $temp))
+    (return
+      (i32.const 0)
+    )
+  )
 )
diff --git a/test/passes/vacuum.txt b/test/passes/vacuum.txt
index c2fb9fc29..6b5d63b2a 100644
--- a/test/passes/vacuum.txt
+++ b/test/passes/vacuum.txt
@@ -207,4 +207,14 @@
   (func $relooperJumpThreading3 (type $0)
     (nop)
   )
+  (func $if2drops (type $3) (result i32)
+    (drop
+      (if
+        (i32.const 1)
+        (call $if2drops)
+        (call $if2drops)
+      )
+    )
+    (i32.const 2)
+  )
 )
diff --git a/test/passes/vacuum.wast b/test/passes/vacuum.wast
index ecc176385..3584df3ff 100644
--- a/test/passes/vacuum.wast
+++ b/test/passes/vacuum.wast
@@ -412,4 +412,16 @@
       )
     )
   )
+  (func $if2drops (result i32)
+    (if
+      (i32.const 1)
+      (drop
+        (call $if2drops)
+      )
+      (drop
+        (call $if2drops)
+      )
+    )
+    (i32.const 2)
+  )
 )
diff --git a/test/unit.asm.js b/test/unit.asm.js
index d4426bd90..7b4b2a96f 100644
--- a/test/unit.asm.js
+++ b/test/unit.asm.js
@@ -572,6 +572,35 @@ function asm(global, env, buffer) {
     return temp | 0;
   }
 
+  function dropIgnoredImportInIf($0,$1,$2) {
+   $0 = $0|0;
+   $1 = $1|0;
+   $2 = $2|0;
+   do {
+    if ($0) {
+     $0 = 1;
+     lb($2 | 0) | 0;
+    } else {
+     break;
+    }
+   } while(0);
+   return;
+  }
+
+  function dropIgnoredImportsInIf($0,$1,$2) {
+   $0 = $0|0;
+   $1 = $1|0;
+   $2 = $2|0;
+   do {
+    if ($0) {
+     lb($1 | 0) | 0;
+    } else {
+     lb($2 | 0) | 0;
+    }
+   } while(0);
+   return;
+  }
+
   var FUNCTION_TABLE_a = [ z, big_negative, z, z ];
   var FUNCTION_TABLE_b = [ w, w, importedDoubles, w ];
   var FUNCTION_TABLE_c = [ z, cneg ];
diff --git a/test/unit.fromasm b/test/unit.fromasm
index fb9f239da..123e087e6 100644
--- a/test/unit.fromasm
+++ b/test/unit.fromasm
@@ -508,13 +508,11 @@
     )
   )
   (func $smallIf
-    (block $do-once$0
-      (if
-        (i32.const 2)
-        (drop
-          (call $lb
-            (i32.const 3)
-          )
+    (if
+      (i32.const 2)
+      (drop
+        (call $lb
+          (i32.const 3)
         )
       )
     )
@@ -1023,4 +1021,27 @@
     )
     (get_local $0)
   )
+  (func $dropIgnoredImportInIf (param $0 i32) (param $1 i32) (param $2 i32)
+    (if
+      (get_local $0)
+      (drop
+        (call $lb
+          (get_local $2)
+        )
+      )
+    )
+  )
+  (func $dropIgnoredImportsInIf (param $0 i32) (param $1 i32) (param $2 i32)
+    (drop
+      (if
+        (get_local $0)
+        (call $lb
+          (get_local $1)
+        )
+        (call $lb
+          (get_local $2)
+        )
+      )
+    )
+  )
 )
diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise
index ad130ea82..b170c8b82 100644
--- a/test/unit.fromasm.imprecise
+++ b/test/unit.fromasm.imprecise
@@ -489,13 +489,11 @@
     )
   )
   (func $smallIf
-    (block $do-once$0
-      (if
-        (i32.const 2)
-        (drop
-          (call $lb
-            (i32.const 3)
-          )
+    (if
+      (i32.const 2)
+      (drop
+        (call $lb
+          (i32.const 3)
         )
       )
     )
@@ -1004,4 +1002,27 @@
     )
     (get_local $0)
   )
+  (func $dropIgnoredImportInIf (param $0 i32) (param $1 i32) (param $2 i32)
+    (if
+      (get_local $0)
+      (drop
+        (call $lb
+          (get_local $2)
+        )
+      )
+    )
+  )
+  (func $dropIgnoredImportsInIf (param $0 i32) (param $1 i32) (param $2 i32)
+    (drop
+      (if
+        (get_local $0)
+        (call $lb
+          (get_local $1)
+        )
+        (call $lb
+          (get_local $2)
+        )
+      )
+    )
+  )
 )
diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts
index 636238f17..913920f8b 100644
--- a/test/unit.fromasm.imprecise.no-opts
+++ b/test/unit.fromasm.imprecise.no-opts
@@ -856,14 +856,14 @@
   )
   (func $smallIf
     (block $do-once$0
-      (drop
-        (if
-          (i32.const 2)
+      (if
+        (i32.const 2)
+        (drop
           (call $lb
             (i32.const 3)
           )
-          (br $do-once$0)
         )
+        (br $do-once$0)
       )
       (nop)
     )
@@ -930,23 +930,23 @@
   )
   (func $breakThroughMany (param $$s i32)
     (block $label$break$L1
-      (drop
-        (if
-          (get_local $$s)
-          (loop $while-in$2
-            (block $while-out$1
-              (if
-                (i32.eqz
-                  (get_local $$s)
-                )
-                (br $label$break$L1)
-              )
-              (call $zeroInit
-                (i32.const 0)
+      (if
+        (get_local $$s)
+        (loop $while-in$2
+          (block $while-out$1
+            (if
+              (i32.eqz
+                (get_local $$s)
               )
-              (br $while-in$2)
+              (br $label$break$L1)
+            )
+            (call $zeroInit
+              (i32.const 0)
             )
+            (br $while-in$2)
           )
+        )
+        (drop
           (i32.const 1337)
         )
       )
@@ -1624,4 +1624,43 @@
       (get_local $temp)
     )
   )
+  (func $dropIgnoredImportInIf (param $$0 i32) (param $$1 i32) (param $$2 i32)
+    (block $do-once$0
+      (if
+        (get_local $$0)
+        (block
+          (set_local $$0
+            (i32.const 1)
+          )
+          (drop
+            (call $lb
+              (get_local $$2)
+            )
+          )
+        )
+        (br $do-once$0)
+      )
+      (nop)
+    )
+    (return)
+  )
+  (func $dropIgnoredImportsInIf (param $$0 i32) (param $$1 i32) (param $$2 i32)
+    (block $do-once$0
+      (if
+        (get_local $$0)
+        (drop
+          (call $lb
+            (get_local $$1)
+          )
+        )
+        (drop
+          (call $lb
+            (get_local $$2)
+          )
+        )
+      )
+      (nop)
+    )
+    (return)
+  )
 )
diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts
index 0684c1464..21e7ea79e 100644
--- a/test/unit.fromasm.no-opts
+++ b/test/unit.fromasm.no-opts
@@ -862,14 +862,14 @@
   )
   (func $smallIf
     (block $do-once$0
-      (drop
-        (if
-          (i32.const 2)
+      (if
+        (i32.const 2)
+        (drop
           (call $lb
             (i32.const 3)
           )
-          (br $do-once$0)
         )
+        (br $do-once$0)
       )
       (nop)
     )
@@ -936,23 +936,23 @@
   )
   (func $breakThroughMany (param $$s i32)
     (block $label$break$L1
-      (drop
-        (if
-          (get_local $$s)
-          (loop $while-in$2
-            (block $while-out$1
-              (if
-                (i32.eqz
-                  (get_local $$s)
-                )
-                (br $label$break$L1)
-              )
-              (call $zeroInit
-                (i32.const 0)
+      (if
+        (get_local $$s)
+        (loop $while-in$2
+          (block $while-out$1
+            (if
+              (i32.eqz
+                (get_local $$s)
               )
-              (br $while-in$2)
+              (br $label$break$L1)
+            )
+            (call $zeroInit
+              (i32.const 0)
             )
+            (br $while-in$2)
           )
+        )
+        (drop
           (i32.const 1337)
         )
       )
@@ -1630,4 +1630,43 @@
       (get_local $temp)
     )
   )
+  (func $dropIgnoredImportInIf (param $$0 i32) (param $$1 i32) (param $$2 i32)
+    (block $do-once$0
+      (if
+        (get_local $$0)
+        (block
+          (set_local $$0
+            (i32.const 1)
+          )
+          (drop
+            (call $lb
+              (get_local $$2)
+            )
+          )
+        )
+        (br $do-once$0)
+      )
+      (nop)
+    )
+    (return)
+  )
+  (func $dropIgnoredImportsInIf (param $$0 i32) (param $$1 i32) (param $$2 i32)
+    (block $do-once$0
+      (if
+        (get_local $$0)
+        (drop
+          (call $lb
+            (get_local $$1)
+          )
+        )
+        (drop
+          (call $lb
+            (get_local $$2)
+          )
+        )
+      )
+      (nop)
+    )
+    (return)
+  )
 )