Fix if else JS printing when if body is a labelled block (#2017)

Before, we'd print

if (..) label: { .. }; else ..

But that is wrong, as it ends the if too early. After this, we print

if (..) label: { .. } else ..

The bug was we checked if the if body was a block, but not if it was a labelled block.

1 files changed, 28 insertions, 28 deletions

diff --git a/test/wasm2js/traps.2asm.js b/test/wasm2js/traps.2asm.js
index d95284e77..1b10eb0a6 100644
--- a/test/wasm2js/traps.2asm.js
+++ b/test/wasm2js/traps.2asm.js
@@ -233,7 +233,7 @@ function asmFunc(global, env, buffer) {
               var$2 = Math_clz32(var$4) - Math_clz32(var$2) | 0;
               if (var$2 >>> 0 <= 31 >>> 0) break label$8;
               break label$2;
-             };
+             }
              i64toi32_i32$2 = var$1$hi;
              i64toi32_i32$1 = var$1;
              i64toi32_i32$0 = 1;
@@ -256,7 +256,7 @@ function asmFunc(global, env, buffer) {
              i64toi32_i32$2 = var$2;
              i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
              return i64toi32_i32$2 | 0;
-            };
+            }
             i64toi32_i32$2 = var$1$hi;
             i64toi32_i32$3 = var$1;
             i64toi32_i32$1 = 0;
@@ -313,18 +313,18 @@ function asmFunc(global, env, buffer) {
             i64toi32_i32$3 = var$2 >>> ((__wasm_ctz_i32(var$3 | 0) | 0) & 31 | 0) | 0;
             i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
             return i64toi32_i32$3 | 0;
-           };
-          };
+           }
+          }
           var$4 = var$3 + 4294967295 | 0;
           if ((var$4 & var$3 | 0 | 0) == (0 | 0)) break label$5;
           var$2 = (Math_clz32(var$3) + 33 | 0) - Math_clz32(var$2) | 0;
           var$3 = 0 - var$2 | 0;
           break label$3;
-         };
+         }
          var$3 = 63 - var$2 | 0;
          var$2 = var$2 + 1 | 0;
          break label$3;
-        };
+        }
         $93 = __tempMemory__;
         var$4 = (var$2 >>> 0) / (var$3 >>> 0) | 0;
         i64toi32_i32$3 = 0;
@@ -350,11 +350,11 @@ function asmFunc(global, env, buffer) {
         i64toi32_i32$2 = var$4;
         i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
         return i64toi32_i32$2 | 0;
-       };
+       }
        var$2 = Math_clz32(var$3) - Math_clz32(var$2) | 0;
        if (var$2 >>> 0 < 31 >>> 0) break label$4;
        break label$2;
-      };
+      }
       i64toi32_i32$2 = var$0$hi;
       i64toi32_i32$2 = 0;
       i64toi32_i32$1 = __tempMemory__;
@@ -383,10 +383,10 @@ function asmFunc(global, env, buffer) {
       i64toi32_i32$3 = $45;
       i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
       return i64toi32_i32$3 | 0;
-     };
+     }
      var$3 = 63 - var$2 | 0;
      var$2 = var$2 + 1 | 0;
-    };
+    }
     i64toi32_i32$3 = var$0$hi;
     i64toi32_i32$3 = 0;
     $133$hi = i64toi32_i32$3;
@@ -545,8 +545,8 @@ function asmFunc(global, env, buffer) {
        break label$15;
       } while (1);
       break label$13;
-     };
-    };
+     }
+    }
     i64toi32_i32$3 = var$5$hi;
     i64toi32_i32$2 = __tempMemory__;
     wasm2js_i32$0 = i64toi32_i32$2;
@@ -577,7 +577,7 @@ function asmFunc(global, env, buffer) {
     i64toi32_i32$3 = i64toi32_i32$3 | i64toi32_i32$0 | 0;
     i64toi32_i32$HIGH_BITS = i64toi32_i32$5;
     return i64toi32_i32$3 | 0;
-   };
+   }
    i64toi32_i32$3 = var$0$hi;
    i64toi32_i32$5 = __tempMemory__;
    wasm2js_i32$0 = i64toi32_i32$5;
@@ -589,7 +589,7 @@ function asmFunc(global, env, buffer) {
    i64toi32_i32$3 = 0;
    var$0 = 0;
    var$0$hi = i64toi32_i32$3;
-  };
+  }
   i64toi32_i32$3 = var$0$hi;
   i64toi32_i32$5 = var$0;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$3;
@@ -864,7 +864,7 @@ function asmFunc(global, env, buffer) {
               var$2 = Math_clz32(var$4) - Math_clz32(var$2) | 0;
               if (var$2 >>> 0 <= 31 >>> 0) break label$8;
               break label$2;
-             };
+             }
              i64toi32_i32$2 = var$1$hi;
              i64toi32_i32$1 = var$1;
              i64toi32_i32$0 = 1;
@@ -887,7 +887,7 @@ function asmFunc(global, env, buffer) {
              i64toi32_i32$2 = var$2;
              i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
              return i64toi32_i32$2 | 0;
-            };
+            }
             i64toi32_i32$2 = var$1$hi;
             i64toi32_i32$3 = var$1;
             i64toi32_i32$1 = 0;
@@ -944,18 +944,18 @@ function asmFunc(global, env, buffer) {
             i64toi32_i32$3 = var$2 >>> ((__wasm_ctz_i32(var$3 | 0) | 0) & 31 | 0) | 0;
             i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
             return i64toi32_i32$3 | 0;
-           };
-          };
+           }
+          }
           var$4 = var$3 + 4294967295 | 0;
           if ((var$4 & var$3 | 0 | 0) == (0 | 0)) break label$5;
           var$2 = (Math_clz32(var$3) + 33 | 0) - Math_clz32(var$2) | 0;
           var$3 = 0 - var$2 | 0;
           break label$3;
-         };
+         }
          var$3 = 63 - var$2 | 0;
          var$2 = var$2 + 1 | 0;
          break label$3;
-        };
+        }
         $93 = __tempMemory__;
         var$4 = (var$2 >>> 0) / (var$3 >>> 0) | 0;
         i64toi32_i32$3 = 0;
@@ -981,11 +981,11 @@ function asmFunc(global, env, buffer) {
         i64toi32_i32$2 = var$4;
         i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
         return i64toi32_i32$2 | 0;
-       };
+       }
        var$2 = Math_clz32(var$3) - Math_clz32(var$2) | 0;
        if (var$2 >>> 0 < 31 >>> 0) break label$4;
        break label$2;
-      };
+      }
       i64toi32_i32$2 = var$0$hi;
       i64toi32_i32$2 = 0;
       i64toi32_i32$1 = __tempMemory__;
@@ -1014,10 +1014,10 @@ function asmFunc(global, env, buffer) {
       i64toi32_i32$3 = $45;
       i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
       return i64toi32_i32$3 | 0;
-     };
+     }
      var$3 = 63 - var$2 | 0;
      var$2 = var$2 + 1 | 0;
-    };
+    }
     i64toi32_i32$3 = var$0$hi;
     i64toi32_i32$3 = 0;
     $133$hi = i64toi32_i32$3;
@@ -1176,8 +1176,8 @@ function asmFunc(global, env, buffer) {
        break label$15;
       } while (1);
       break label$13;
-     };
-    };
+     }
+    }
     i64toi32_i32$3 = var$5$hi;
     i64toi32_i32$2 = __tempMemory__;
     wasm2js_i32$0 = i64toi32_i32$2;
@@ -1208,7 +1208,7 @@ function asmFunc(global, env, buffer) {
     i64toi32_i32$3 = i64toi32_i32$3 | i64toi32_i32$0 | 0;
     i64toi32_i32$HIGH_BITS = i64toi32_i32$5;
     return i64toi32_i32$3 | 0;
-   };
+   }
    i64toi32_i32$3 = var$0$hi;
    i64toi32_i32$5 = __tempMemory__;
    wasm2js_i32$0 = i64toi32_i32$5;
@@ -1220,7 +1220,7 @@ function asmFunc(global, env, buffer) {
    i64toi32_i32$3 = 0;
    var$0 = 0;
    var$0$hi = i64toi32_i32$3;
-  };
+  }
   i64toi32_i32$3 = var$0$hi;
   i64toi32_i32$5 = var$0;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$3;