6 files changed, 38 insertions, 16 deletions
diff --git a/test/emcc_O2_hello_world.wast.fromBinary b/test/emcc_O2_hello_world.wast.fromBinary
index 2a52ddeca..f940c50e8 100644
--- a/test/emcc_O2_hello_world.wast.fromBinary
+++ b/test/emcc_O2_hello_world.wast.fromBinary
@@ -12488,9 +12488,9 @@
         )
         (i32.const 2)
       )
-      (get_local $var$0)
-      (get_local $var$0)
-      (get_local $var$0)
+      (get_local $var$1)
+      (get_local $var$2)
+      (get_local $var$3)
     )
   )
   (func $stackAlloc (param $var$0 i32)
@@ -12565,7 +12565,7 @@
         )
         (i32.store align=4
           (i32.const 48)
-          (get_local $var$0)
+          (get_local $var$1)
         )
       )
     )
@@ -12578,7 +12578,7 @@
           (get_local $var$0)
         )
         (i32.const 1)
-        (get_local $var$0)
+        (get_local $var$1)
       )
       (i32.const 255)
     )
@@ -12592,7 +12592,7 @@
         )
         (i32.const 0)
       )
-      (get_local $var$0)
+      (get_local $var$1)
     )
   )
   (func $_cleanup_418 (param $var$0 i32)
@@ -12622,7 +12622,7 @@
       )
       (i32.store align=4
         (i32.const 16)
-        (get_local $var$0)
+        (get_local $var$1)
       )
     )
   )
@@ -12635,7 +12635,7 @@
         )
         (i32.const 10)
       )
-      (get_local $var$0)
+      (get_local $var$1)
     )
   )
   (func $b1 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32)
diff --git a/test/emcc_hello_world.wast.fromBinary b/test/emcc_hello_world.wast.fromBinary
index 0fe343afe..3fc91d625 100644
--- a/test/emcc_hello_world.wast.fromBinary
+++ b/test/emcc_hello_world.wast.fromBinary
@@ -117,7 +117,7 @@
       )
       (i32.store align=4
         (i32.const 16)
-        (get_local $var$0)
+        (get_local $var$1)
       )
     )
   )
@@ -136,7 +136,7 @@
         )
         (i32.store align=4
           (i32.const 56)
-          (get_local $var$0)
+          (get_local $var$1)
         )
       )
     )
@@ -34059,7 +34059,7 @@
         )
         (i32.const 0)
       )
-      (get_local $var$0)
+      (get_local $var$1)
     )
   )
   (func $dynCall_iiii (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32)
@@ -34071,9 +34071,9 @@
         )
         (i32.const 2)
       )
-      (get_local $var$0)
-      (get_local $var$0)
-      (get_local $var$0)
+      (get_local $var$1)
+      (get_local $var$2)
+      (get_local $var$3)
     )
   )
   (func $dynCall_vi (param $var$0 i32) (param $var$1 i32)
@@ -34085,7 +34085,7 @@
         )
         (i32.const 10)
       )
-      (get_local $var$0)
+      (get_local $var$1)
     )
   )
   (func $b0 (param $var$0 i32)
diff --git a/test/hello_world.wast.fromBinary b/test/hello_world.wast.fromBinary
index 4027521a1..98e66d0da 100644
--- a/test/hello_world.wast.fromBinary
+++ b/test/hello_world.wast.fromBinary
@@ -5,7 +5,7 @@
   (func $add (param $var$0 i32) (param $var$1 i32)
     (i32.add
       (get_local $var$0)
-      (get_local $var$0)
+      (get_local $var$1)
     )
   )
 )
diff --git a/test/min.2asm.js b/test/min.2asm.js
index 4bf4cb610..ea1d2d83f 100644
--- a/test/min.2asm.js
+++ b/test/min.2asm.js
@@ -49,6 +49,17 @@ function asmFunc(global, env, buffer) {
   return wasm2asm_i32$0 | 0;
  }
  
+ function f1(i1, i2, i3) {
+  i1 = i1 | 0;
+  i2 = i2 | 0;
+  i3 = i3 | 0;
+  var wasm2asm_i32$0 = 0;
+  topmost : {
+   wasm2asm_i32$0 = i3;
+  }
+  return wasm2asm_i32$0 | 0;
+ }
+ 
  return {
   floats: floats
  };
diff --git a/test/min.wast b/test/min.wast
index f765b64e8..86caf3cd2 100644
--- a/test/min.wast
+++ b/test/min.wast
@@ -46,4 +46,9 @@
       (i32.const 0)
     )
   )
+  (func $f1 (param $i1 i32) (param $i2 i32) (param $i3 i32) (result i32)
+    (block $topmost
+      (get_local $i3)
+    )
+  )
 )
diff --git a/test/min.wast.fromBinary b/test/min.wast.fromBinary
index 6945bcd54..d8023d88c 100644
--- a/test/min.wast.fromBinary
+++ b/test/min.wast.fromBinary
@@ -3,6 +3,7 @@
   (type $0 (func (param f32) (result f32)))
   (type $1 (func (param i32 i32)))
   (type $2 (func (param i32) (result i32)))
+  (type $3 (func (param i32 i32 i32) (result i32)))
   (export "floats" $floats)
   (func $floats (param $var$0 f32)
     (local $var$1 f32)
@@ -49,5 +50,10 @@
       (i32.const 0)
     )
   )
+  (func $f1 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32)
+    (block $label$0
+      (get_local $var$2)
+    )
+  )
 )