Merge pull request #429 from wasmx/drop-operand-fix

Remove redundant check from drop_operand
wasmx · Jul 22, 2020 · cb62d80 · cb62d80
2 parents 62aaee7 + 67fa81c
commit cb62d80
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/fizzy/parser_expr.cpp b/lib/fizzy/parser_expr.cpp
@@ -119,8 +119,11 @@ inline void drop_operand(
         static_cast<int>(operand_stack.size()) < frame.parent_stack_height + 1)
         throw validation_error{"stack underflow"};
 
-    if (frame.unreachable && static_cast<int>(operand_stack.size()) == frame.parent_stack_height)
+    if (static_cast<int>(operand_stack.size()) == frame.parent_stack_height)
+    {
+        assert(frame.unreachable);  // implied from stack underflow check above
         return;
+    }
 
     const auto actual_type = operand_stack.pop();
     if (expected_type.has_value() && actual_type != *expected_type)