5 files changed, 93 insertions, 22 deletions
diff --git a/src/wasm2js.h b/src/wasm2js.h
index 15ae019ea..d965dcc0c 100644
--- a/src/wasm2js.h
+++ b/src/wasm2js.h
@@ -1181,6 +1181,11 @@ Ref Wasm2JSBuilder::processExpression(Expression* curr,
 
     Ref visitLoop(Loop* curr) {
       Name asmLabel = curr->name;
+      if (!asmLabel) {
+        // This loop has no label, so it cannot be continued to. We can just
+        // emit the body.
+        return visit(curr->body, result);
+      }
       continueLabels.insert(asmLabel);
       Ref body = visit(curr->body, result);
       // if we can reach the end of the block, we must leave the while (1) loop
@@ -1779,7 +1784,7 @@ Ref Wasm2JSBuilder::processExpression(Expression* curr,
           return ret;
         }
         default: {
-          Fatal() << "Unhandled type in unary: " << curr;
+          Fatal() << "Unhandled type in unary: " << *curr;
         }
       }
     }
@@ -1949,7 +1954,7 @@ Ref Wasm2JSBuilder::processExpression(Expression* curr,
           }
           return ret;
         default:
-          Fatal() << "Unhandled type in binary: " << curr;
+          Fatal() << "Unhandled type in binary: " << *curr;
       }
       return makeJsCoercion(ret, wasmToJsType(curr->type));
     }
diff --git a/test/wasm2js/br_table_temp.2asm.js b/test/wasm2js/br_table_temp.2asm.js
index a8592a186..01a2238e1 100644
--- a/test/wasm2js/br_table_temp.2asm.js
+++ b/test/wasm2js/br_table_temp.2asm.js
@@ -12554,12 +12554,10 @@ function asmFunc(imports) {
  function $19() {
   var $1_1 = 0, $2_1 = 0, $4_1 = 0;
   label : {
-   $null_Name_ : while (1) {
-    $1_1 = 3;
-    switch (0 | 0) {
-    default:
-     break label;
-    };
+   $1_1 = 3;
+   switch (0 | 0) {
+   default:
+    break label;
    };
   }
   return $1_1 | 0;
@@ -12568,13 +12566,11 @@ function asmFunc(imports) {
  function $20() {
   var $1_1 = 0, $2_1 = 0, $4_1 = 0;
   label : {
-   $null_Name_ : while (1) {
-    dummy();
-    $1_1 = 4;
-    switch (-1 | 0) {
-    default:
-     break label;
-    };
+   dummy();
+   $1_1 = 4;
+   switch (-1 | 0) {
+   default:
+    break label;
    };
   }
   return $1_1 | 0;
@@ -12583,13 +12579,11 @@ function asmFunc(imports) {
  function $21() {
   var $1_1 = 0;
   label : {
-   $null_Name_ : while (1) {
-    dummy();
-    $1_1 = 5;
-    switch (1 | 0) {
-    default:
-     break label;
-    };
+   dummy();
+   $1_1 = 5;
+   switch (1 | 0) {
+   default:
+    break label;
    };
   }
   return $1_1 | 0;
diff --git a/test/wasm2js/empty_loop.2asm.js b/test/wasm2js/empty_loop.2asm.js
new file mode 100644
index 000000000..7e81b4643
--- /dev/null
+++ b/test/wasm2js/empty_loop.2asm.js
@@ -0,0 +1,28 @@
+
+function wasm2js_trap() { throw new Error('abort'); }
+
+function asmFunc(imports) {
+ var Math_imul = Math.imul;
+ var Math_fround = Math.fround;
+ var Math_abs = Math.abs;
+ var Math_clz32 = Math.clz32;
+ var Math_min = Math.min;
+ var Math_max = Math.max;
+ var Math_floor = Math.floor;
+ var Math_ceil = Math.ceil;
+ var Math_trunc = Math.trunc;
+ var Math_sqrt = Math.sqrt;
+ var g = 0;
+ function test() {
+  g = 0;
+  wasm2js_trap();
+ }
+ 
+ return {
+  "test": test
+ };
+}
+
+var retasmFunc = asmFunc({
+});
+export var test = retasmFunc.test;
diff --git a/test/wasm2js/empty_loop.2asm.js.opt b/test/wasm2js/empty_loop.2asm.js.opt
new file mode 100644
index 000000000..ff37d056f
--- /dev/null
+++ b/test/wasm2js/empty_loop.2asm.js.opt
@@ -0,0 +1,26 @@
+
+function wasm2js_trap() { throw new Error('abort'); }
+
+function asmFunc(imports) {
+ var Math_imul = Math.imul;
+ var Math_fround = Math.fround;
+ var Math_abs = Math.abs;
+ var Math_clz32 = Math.clz32;
+ var Math_min = Math.min;
+ var Math_max = Math.max;
+ var Math_floor = Math.floor;
+ var Math_ceil = Math.ceil;
+ var Math_trunc = Math.trunc;
+ var Math_sqrt = Math.sqrt;
+ function test() {
+  wasm2js_trap();
+ }
+ 
+ return {
+  "test": test
+ };
+}
+
+var retasmFunc = asmFunc({
+});
+export var test = retasmFunc.test;
diff --git a/test/wasm2js/empty_loop.wast b/test/wasm2js/empty_loop.wast
new file mode 100644
index 000000000..8f22c033d
--- /dev/null
+++ b/test/wasm2js/empty_loop.wast
@@ -0,0 +1,18 @@
+(module
+ (global $g (mut i32) (i32.const 0))
+
+ (func $test (export "test")
+  ;; Loops without labels. We should not emit anything invalid here (like a
+  ;; null name, which would end up identical between the two, which is wrong).
+  (loop
+   (loop
+    ;; Some content, so the loop is not trivial.
+    (global.set $g
+     (i32.const 0)
+    )
+    (unreachable)
+   )
+   (unreachable)
+  )
+ )
+)