parser: Handle unreachable reminder of a block

wasmx · Apr 2, 2020 · 8687ebf · 8687ebf
1 parent 7e3e9ee
commit 8687ebf
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/fizzy/parser_expr.cpp b/lib/fizzy/parser_expr.cpp
@@ -177,11 +177,11 @@ parser_result<Code> parse_expr(const uint8_t* pos, const uint8_t* end, bool have
         case Instr::f64_reinterpret_i64:
 
         case Instr::unreachable:
+        case Instr::return_:
             frame.unreachable = true;
             break;
 
         case Instr::nop:
-        case Instr::return_:
         case Instr::drop:
         case Instr::select:
         case Instr::i32_eq:
@@ -339,6 +339,10 @@ parser_result<Code> parse_expr(const uint8_t* pos, const uint8_t* end, bool have
                 throw validation_error{"invalid label index"};
 
             push(code.immediates, label_idx);
+
+            if (instr == Instr::br)
+                frame.unreachable = true;
+
             break;
         }
 
@@ -375,6 +379,9 @@ parser_result<Code> parse_expr(const uint8_t* pos, const uint8_t* end, bool have
             for (const auto idx : label_indices)
                 push(code.immediates, idx);
             push(code.immediates, default_label_idx);
+
+            frame.unreachable = true;
+
             break;
         }