4 files changed, 69 insertions, 49 deletions
diff --git a/test/wasm2js/br.2asm.js b/test/wasm2js/br.2asm.js
index 73484e457..c60de9fc2 100644
--- a/test/wasm2js/br.2asm.js
+++ b/test/wasm2js/br.2asm.js
@@ -106,8 +106,10 @@ function asmFunc(global, env) {
  function $13() {
   var $0 = 0, $1_1 = 0, $3_1 = 0;
   block : {
-   $0 = 3;
-   break block;
+   loop_in : while (1) {
+    $0 = 3;
+    break block;
+   };
   }
   return $0 | 0;
  }
@@ -115,9 +117,11 @@ function asmFunc(global, env) {
  function $14() {
   var $0 = 0, $1_1 = 0, $3_1 = 0;
   block : {
-   dummy();
-   $0 = 4;
-   break block;
+   loop_in : while (1) {
+    dummy();
+    $0 = 4;
+    break block;
+   };
   }
   return $0 | 0;
  }
@@ -125,9 +129,11 @@ function asmFunc(global, env) {
  function $15() {
   var $0 = 0;
   block : {
-   dummy();
-   $0 = 5;
-   break block;
+   loop_in : while (1) {
+    dummy();
+    $0 = 5;
+    break block;
+   };
   }
   return $0 | 0;
  }
diff --git a/test/wasm2js/br_table.2asm.js b/test/wasm2js/br_table.2asm.js
index 4171374b9..5e1c2c05c 100644
--- a/test/wasm2js/br_table.2asm.js
+++ b/test/wasm2js/br_table.2asm.js
@@ -12560,10 +12560,12 @@ function asmFunc(global, env) {
  function $20() {
   var $1_1 = 0, $2_1 = 0, $4_1 = 0;
   fake_return_waka123 : {
-   $1_1 = 3;
-   switch (0 | 0) {
-   default:
-    break fake_return_waka123;
+   loop_in : while (1) {
+    $1_1 = 3;
+    switch (0 | 0) {
+    default:
+     break fake_return_waka123;
+    };
    };
   }
   return $1_1 | 0;
@@ -12572,11 +12574,13 @@ function asmFunc(global, env) {
  function $21() {
   var $1_1 = 0, $2_1 = 0, $4_1 = 0;
   fake_return_waka123 : {
-   dummy();
-   $1_1 = 4;
-   switch (-1 | 0) {
-   default:
-    break fake_return_waka123;
+   loop_in : while (1) {
+    dummy();
+    $1_1 = 4;
+    switch (-1 | 0) {
+    default:
+     break fake_return_waka123;
+    };
    };
   }
   return $1_1 | 0;
@@ -12585,11 +12589,13 @@ function asmFunc(global, env) {
  function $22() {
   var $1_1 = 0;
   fake_return_waka123 : {
-   dummy();
-   $1_1 = 5;
-   switch (1 | 0) {
-   default:
-    break fake_return_waka123;
+   loop_in : while (1) {
+    dummy();
+    $1_1 = 5;
+    switch (1 | 0) {
+    default:
+     break fake_return_waka123;
+    };
    };
   }
   return $1_1 | 0;
diff --git a/test/wasm2js/br_table_temp.2asm.js b/test/wasm2js/br_table_temp.2asm.js
index 3a56dda00..99d7ceeef 100644
--- a/test/wasm2js/br_table_temp.2asm.js
+++ b/test/wasm2js/br_table_temp.2asm.js
@@ -12556,10 +12556,12 @@ function asmFunc(global, env) {
  function $20() {
   var $1_1 = 0, $2_1 = 0, $4_1 = 0;
   fake_return_waka123 : {
-   $1_1 = 3;
-   switch (0 | 0) {
-   default:
-    break fake_return_waka123;
+   loop_in : while (1) {
+    $1_1 = 3;
+    switch (0 | 0) {
+    default:
+     break fake_return_waka123;
+    };
    };
   }
   return $1_1 | 0;
@@ -12568,11 +12570,13 @@ function asmFunc(global, env) {
  function $21() {
   var $1_1 = 0, $2_1 = 0, $4_1 = 0;
   fake_return_waka123 : {
-   dummy();
-   $1_1 = 4;
-   switch (-1 | 0) {
-   default:
-    break fake_return_waka123;
+   loop_in : while (1) {
+    dummy();
+    $1_1 = 4;
+    switch (-1 | 0) {
+    default:
+     break fake_return_waka123;
+    };
    };
   }
   return $1_1 | 0;
@@ -12581,11 +12585,13 @@ function asmFunc(global, env) {
  function $22() {
   var $1_1 = 0;
   fake_return_waka123 : {
-   dummy();
-   $1_1 = 5;
-   switch (1 | 0) {
-   default:
-    break fake_return_waka123;
+   loop_in : while (1) {
+    dummy();
+    $1_1 = 5;
+    switch (1 | 0) {
+    default:
+     break fake_return_waka123;
+    };
    };
   }
   return $1_1 | 0;
diff --git a/test/wasm2js/excess_fallthrough.2asm.js b/test/wasm2js/excess_fallthrough.2asm.js
index d1290aa50..3c8d09bf4 100644
--- a/test/wasm2js/excess_fallthrough.2asm.js
+++ b/test/wasm2js/excess_fallthrough.2asm.js
@@ -18,20 +18,22 @@ function asmFunc(global, env) {
  
  function foo($0) {
   $0 = $0 | 0;
-  label$5 : {
-   bar();
-   block : {
-    switch (123 | 0) {
-    case 0:
-     bar();
-     break;
-    default:
-     break label$5;
-    };
+  label$4 : while (1) {
+   label$5 : {
+    bar();
+    block : {
+     switch (123 | 0) {
+     case 0:
+      bar();
+      break;
+     default:
+      break label$5;
+     };
+    }
+    return;
    }
-   return;
-  }
-  abort();
+   abort();
+  };
  }
  
  return {