Implement assert_invalid for wasm-interp (#294)

27 files changed, 1548 insertions, 47 deletions

diff --git a/src/binary-reader-interpreter.c b/src/binary-reader-interpreter.c
index fad06ade..891cc7c6 100644
--- a/src/binary-reader-interpreter.c
+++ b/src/binary-reader-interpreter.c
@@ -121,6 +121,7 @@ typedef struct Context {
   Uint32Vector global_index_mapping;
 
   uint32_t num_func_imports;
+  uint32_t num_global_imports;
 
   /* values cached in the Context so they can be shared between callbacks */
   WasmInterpreterTypedValue init_expr_value;
@@ -486,11 +487,17 @@ static WasmResult check_import_limits(Context* ctx,
   return WASM_OK;
 }
 
-static void append_export(Context* ctx,
-                          WasmInterpreterModule* module,
-                          WasmExternalKind kind,
-                          uint32_t item_index,
-                          WasmStringSlice name) {
+static WasmResult append_export(Context* ctx,
+                                WasmInterpreterModule* module,
+                                WasmExternalKind kind,
+                                uint32_t item_index,
+                                WasmStringSlice name) {
+  if (wasm_find_binding_index_by_name(&module->export_bindings, &name) != -1) {
+    print_error(ctx, "duplicate export \"" PRIstringslice "\"",
+                WASM_PRINTF_STRING_SLICE_ARG(name));
+    return WASM_ERROR;
+  }
+
   WasmInterpreterExport* export =
       wasm_append_interpreter_export(ctx->allocator, &module->exports);
   export->name = wasm_dup_string_slice(ctx->allocator, name);
@@ -500,6 +507,7 @@ static void append_export(Context* ctx,
   WasmBinding* binding = wasm_insert_binding(
       ctx->allocator, &module->export_bindings, &export->name);
   binding->index = module->exports.size - 1;
+  return WASM_OK;
 }
 
 static void on_host_import_print_error(const char* msg, void* user_data) {
@@ -694,6 +702,7 @@ static WasmResult on_import_global(uint32_t import_index,
   }
   wasm_append_uint32_value(ctx->allocator, &ctx->global_index_mapping,
                            &global_env_index);
+  ctx->num_global_imports++;
   return WASM_OK;
 }
 
@@ -785,6 +794,12 @@ static WasmResult begin_global(uint32_t index,
 static WasmResult end_global_init_expr(uint32_t index, void* user_data) {
   Context* ctx = user_data;
   WasmInterpreterGlobal* global = get_global_by_module_index(ctx, index);
+  if (ctx->init_expr_value.type != global->typed_value.type) {
+    print_error(ctx, "type mismatch in global, expected %s but got %s.",
+                wasm_get_type_name(global->typed_value.type),
+                wasm_get_type_name(ctx->init_expr_value.type));
+    return WASM_ERROR;
+  }
   global->typed_value = ctx->init_expr_value;
   return WASM_OK;
 }
@@ -811,8 +826,18 @@ static WasmResult on_init_expr_get_global_expr(uint32_t index,
                                                uint32_t global_index,
                                                void* user_data) {
   Context* ctx = user_data;
+  if (global_index >= ctx->num_global_imports) {
+    print_error(ctx,
+                "initializer expression can only reference an imported global");
+    return WASM_ERROR;
+  }
   WasmInterpreterGlobal* ref_global =
       get_global_by_module_index(ctx, global_index);
+  if (ref_global->mutable_) {
+    print_error(ctx,
+                "initializer expression cannot reference a mutable global");
+    return WASM_ERROR;
+  }
   ctx->init_expr_value = ref_global->typed_value;
   return WASM_OK;
 }
@@ -854,28 +879,49 @@ static WasmResult on_export(uint32_t index,
       item_index = ctx->module->memory_index;
       break;
 
-    case WASM_EXTERNAL_KIND_GLOBAL:
+    case WASM_EXTERNAL_KIND_GLOBAL: {
       item_index = translate_global_index_to_env(ctx, item_index);
+      WasmInterpreterGlobal* global = &ctx->env->globals.data[item_index];
+      if (global->mutable_) {
+        print_error(ctx, "mutable globals cannot be exported");
+        return WASM_ERROR;
+      }
       break;
+    }
 
     case WASM_NUM_EXTERNAL_KINDS:
       assert(0);
       break;
   }
-  append_export(ctx, ctx->module, kind, item_index, name);
-  return WASM_OK;
+  return append_export(ctx, ctx->module, kind, item_index, name);
 }
 
 static WasmResult on_start_function(uint32_t func_index, void* user_data) {
   Context* ctx = user_data;
-  ctx->module->defined.start_func_index =
-      translate_func_index_to_env(ctx, func_index);
+  uint32_t start_func_index = translate_func_index_to_env(ctx, func_index);
+  WasmInterpreterFunc* start_func =
+      get_func_by_env_index(ctx, start_func_index);
+  WasmInterpreterFuncSignature* sig =
+      get_signature_by_env_index(ctx, start_func->sig_index);
+  if (sig->param_types.size != 0) {
+    print_error(ctx, "start function must be nullary");
+    return WASM_ERROR;
+  }
+  if (sig->result_types.size != 0) {
+    print_error(ctx, "start function must not return anything");
+    return WASM_ERROR;
+  }
+  ctx->module->defined.start_func_index = start_func_index;
   return WASM_OK;
 }
 
 static WasmResult end_elem_segment_init_expr(uint32_t index, void* user_data) {
   Context* ctx = user_data;
-  assert(ctx->init_expr_value.type == WASM_TYPE_I32);
+  if (ctx->init_expr_value.type != WASM_TYPE_I32) {
+    print_error(ctx, "type mismatch in elem segment, expected i32 but got %s",
+                wasm_get_type_name(ctx->init_expr_value.type));
+    return WASM_ERROR;
+  }
   ctx->table_offset = ctx->init_expr_value.value.i32;
   return WASM_OK;
 }
@@ -894,6 +940,13 @@ static WasmResult on_elem_segment_function_index_check(uint32_t index,
     return WASM_ERROR;
   }
 
+  uint32_t max_func_index = ctx->func_index_mapping.size;
+  if (func_index >= max_func_index) {
+    print_error(ctx, "invalid func_index: %d (max %d)", func_index,
+                max_func_index);
+    return WASM_ERROR;
+  }
+
   table->func_indexes.data[ctx->table_offset++] =
       translate_func_index_to_env(ctx, func_index);
   return WASM_OK;
@@ -919,7 +972,11 @@ static WasmResult on_data_segment_data_check(uint32_t index,
   assert(ctx->module->memory_index != WASM_INVALID_INDEX);
   WasmInterpreterMemory* memory =
       &ctx->env->memories.data[ctx->module->memory_index];
-  assert(ctx->init_expr_value.type == WASM_TYPE_I32);
+  if (ctx->init_expr_value.type != WASM_TYPE_I32) {
+    print_error(ctx, "type mismatch in data segment, expected i32 but got %s",
+                wasm_get_type_name(ctx->init_expr_value.type));
+    return WASM_ERROR;
+  }
   uint32_t address = ctx->init_expr_value.value.i32;
   uint64_t end_address = (uint64_t)address + (uint64_t)size;
   if (end_address > memory->byte_size) {
@@ -964,10 +1021,14 @@ static void push_label(Context* ctx,
   LOGF("   : +depth %" PRIzd "\n", ctx->label_stack.size - 1);
 }
 
+static void wasm_destroy_label(WasmAllocator* allocator, Label* label) {
+  wasm_destroy_type_vector(allocator, &label->sig);
+}
+
 static void pop_label(Context* ctx) {
   LOGF("   : -depth %" PRIzd "\n", ctx->label_stack.size - 1);
   Label* label = top_label(ctx);
-  wasm_destroy_type_vector(ctx->allocator, &label->sig);
+  wasm_destroy_label(ctx->allocator, label);
   ctx->label_stack.size--;
   /* reduce the depth_fixups stack as well, but it may be smaller than
    * label_stack so only do it conditionally. */
@@ -1257,6 +1318,26 @@ static WasmResult on_local_decl(uint32_t decl_index,
   return WASM_OK;
 }
 
+static WasmResult check_has_memory(Context* ctx, WasmOpcode opcode) {
+  if (ctx->module->memory_index == WASM_INVALID_INDEX) {
+    print_error(ctx, "%s requires an imported or defined memory.",
+                wasm_get_opcode_name(opcode));
+    return WASM_ERROR;
+  }
+  return WASM_OK;
+}
+
+static WasmResult check_align(Context* ctx,
+                              uint32_t alignment_log2,
+                              uint32_t natural_alignment) {
+  if (alignment_log2 >= 32 || (1U << alignment_log2) > natural_alignment) {
+    print_error(ctx, "alignment must not be larger than natural alignment (%u)",
+                natural_alignment);
+    return WASM_ERROR;
+  }
+  return WASM_OK;
+}
+
 static WasmResult on_unary_expr(WasmOpcode opcode, void* user_data) {
   Context* ctx = user_data;
   CHECK_RESULT(check_opcode1(ctx, opcode));
@@ -1391,6 +1472,9 @@ static WasmResult on_br_if_expr(uint32_t depth, void* user_data) {
   CHECK_DEPTH(ctx, depth);
   depth = translate_depth(ctx, depth);
   CHECK_RESULT(pop_and_check_1_type(ctx, WASM_TYPE_I32, "br_if"));
+  Label* label = get_label(ctx, depth);
+  if (label->label_type != LABEL_TYPE_LOOP)
+    CHECK_RESULT(check_n_types(ctx, &label->sig, "br_if"));
   /* flip the br_if so if <cond> is true it can drop values from the stack */
   CHECK_RESULT(emit_opcode(ctx, WASM_OPCODE_BR_UNLESS));
   uint32_t fixup_br_offset = get_istream_offset(ctx);
@@ -1419,6 +1503,7 @@ static WasmResult on_br_table_expr(WasmBinaryReaderContext* context,
   uint32_t i;
   for (i = 0; i <= num_targets; ++i) {
     uint32_t depth = i != num_targets ? target_depths[i] : default_target_depth;
+    CHECK_DEPTH(ctx, depth);
     depth = translate_depth(ctx, depth);
     Label* label = get_label(ctx, depth);
     CHECK_RESULT(check_n_types(ctx, &label->sig, "br_table"));
@@ -1457,6 +1542,10 @@ static WasmResult on_call_expr(uint32_t func_index, void* user_data) {
 
 static WasmResult on_call_indirect_expr(uint32_t sig_index, void* user_data) {
   Context* ctx = user_data;
+  if (ctx->module->table_index == WASM_INVALID_INDEX) {
+    print_error(ctx, "found call_indirect operator, but no table");
+    return WASM_ERROR;
+  }
   WasmInterpreterFuncSignature* sig =
       get_signature_by_module_index(ctx, sig_index);
   CHECK_RESULT(pop_and_check_1_type(ctx, WASM_TYPE_I32, "call_indirect"));
@@ -1577,6 +1666,7 @@ static WasmResult on_tee_local_expr(uint32_t local_index, void* user_data) {
 
 static WasmResult on_grow_memory_expr(void* user_data) {
   Context* ctx = user_data;
+  CHECK_RESULT(check_has_memory(ctx, WASM_OPCODE_GROW_MEMORY));
   CHECK_RESULT(pop_and_check_1_type(ctx, WASM_TYPE_I32, "grow_memory"));
   CHECK_RESULT(emit_opcode(ctx, WASM_OPCODE_GROW_MEMORY));
   CHECK_RESULT(emit_i32(ctx, ctx->module->memory_index));
@@ -1589,6 +1679,9 @@ static WasmResult on_load_expr(WasmOpcode opcode,
                                uint32_t offset,
                                void* user_data) {
   Context* ctx = user_data;
+  CHECK_RESULT(check_has_memory(ctx, opcode));
+  CHECK_RESULT(
+      check_align(ctx, alignment_log2, wasm_get_opcode_memory_size(opcode)));
   CHECK_RESULT(check_opcode1(ctx, opcode));
   CHECK_RESULT(emit_opcode(ctx, opcode));
   CHECK_RESULT(emit_i32(ctx, ctx->module->memory_index));
@@ -1601,6 +1694,9 @@ static WasmResult on_store_expr(WasmOpcode opcode,
                                 uint32_t offset,
                                 void* user_data) {
   Context* ctx = user_data;
+  CHECK_RESULT(check_has_memory(ctx, opcode));
+  CHECK_RESULT(
+      check_align(ctx, alignment_log2, wasm_get_opcode_memory_size(opcode)));
   CHECK_RESULT(check_opcode2(ctx, opcode));
   CHECK_RESULT(emit_opcode(ctx, opcode));
   CHECK_RESULT(emit_i32(ctx, ctx->module->memory_index));
@@ -1610,6 +1706,7 @@ static WasmResult on_store_expr(WasmOpcode opcode,
 
 static WasmResult on_current_memory_expr(void* user_data) {
   Context* ctx = user_data;
+  CHECK_RESULT(check_has_memory(ctx, WASM_OPCODE_CURRENT_MEMORY));
   CHECK_RESULT(emit_opcode(ctx, WASM_OPCODE_CURRENT_MEMORY));
   CHECK_RESULT(emit_i32(ctx, ctx->module->memory_index));
   push_type(ctx, WASM_TYPE_I32);
@@ -1748,7 +1845,7 @@ static WasmBinaryReader s_binary_reader_segments = {
 
 static void destroy_context(Context* ctx) {
   wasm_destroy_type_vector(ctx->allocator, &ctx->type_stack);
-  wasm_destroy_label_vector(ctx->allocator, &ctx->label_stack);
+  WASM_DESTROY_VECTOR_AND_ELEMENTS(ctx->allocator, ctx->label_stack, label);
   WASM_DESTROY_VECTOR_AND_ELEMENTS(ctx->allocator, ctx->depth_fixups,
                                    uint32_vector);
   WASM_DESTROY_VECTOR_AND_ELEMENTS(ctx->allocator, ctx->func_fixups,
diff --git a/src/tools/wasm-interp.c b/src/tools/wasm-interp.c
index 0dc66d3d..4a8a9c58 100644
--- a/src/tools/wasm-interp.c
+++ b/src/tools/wasm-interp.c
@@ -1275,21 +1275,17 @@ static WasmResult on_assert_unlinkable_command(Context* ctx,
 static WasmResult on_assert_invalid_command(Context* ctx,
                                             WasmStringSlice filename,
                                             WasmStringSlice text) {
-  /* TODO: need to correctly support invalid asserts in interpreter */
-  return WASM_OK;
-#if 0
   WasmBinaryErrorHandler* error_handler =
       new_custom_error_handler(ctx, "assert_invalid");
+  WasmInterpreterEnvironment env;
+  WASM_ZERO_MEMORY(env);
+  init_environment(ctx->allocator, &env);
 
   ctx->total++;
   char* path = create_module_path(ctx, filename);
   WasmInterpreterModule* module;
-  WasmInterpreterEnvironmentMark mark =
-      wasm_mark_interpreter_environment(&ctx->env);
   WasmResult result =
-      read_module(ctx->allocator, path, &ctx->env, error_handler, &module);
-  wasm_reset_interpreter_environment_to_mark(ctx->allocator, &ctx->env, mark);
-
+      read_module(ctx->allocator, path, &env, error_handler, &module);
   if (WASM_FAILED(result)) {
     ctx->passed++;
     result = WASM_OK;
@@ -1299,9 +1295,9 @@ static WasmResult on_assert_invalid_command(Context* ctx,
   }
 
   wasm_free(ctx->allocator, path);
+  wasm_destroy_interpreter_environment(ctx->allocator, &env);
   destroy_custom_error_handler(ctx->allocator, error_handler);
   return result;
-#endif
 }
 
 static WasmResult on_assert_uninstantiable_command(Context* ctx,
diff --git a/test/spec/block.txt b/test/spec/block.txt
index d28bdcae..f73829f5 100644
--- a/test/spec/block.txt
+++ b/test/spec/block.txt
@@ -145,5 +145,65 @@ assert_invalid error:
   out/third_party/testsuite/block.wast:246:11: type mismatch at function. got i64, expected i32
   (module (func $type-break-operand-num-vs-num (result i32)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14/14 tests passed.
+out/third_party/testsuite/block.wast:133: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/block.wast:137: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/block.wast:141: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/block.wast:145: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/block.wast:150: assert_invalid passed:
+  error: type stack at end of block is 1. expected 0
+  error: @0x0000001c: on_end_expr callback failed
+out/third_party/testsuite/block.wast:156: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001d: end_function_body callback failed
+out/third_party/testsuite/block.wast:162: assert_invalid passed:
+  error: type stack at end of block is 1. expected 0
+  error: @0x00000020: on_end_expr callback failed
+out/third_party/testsuite/block.wast:169: assert_invalid passed:
+  error: type stack size too small at br. got 0, expected at least 1
+  error: @0x0000001c: on_br_expr callback failed
+out/third_party/testsuite/block.wast:175: assert_invalid passed:
+  error: type stack size too small at br. got 0, expected at least 1
+  error: @0x0000001c: on_br_expr callback failed
+out/third_party/testsuite/block.wast:182: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000021: end_function_body callback failed
+out/third_party/testsuite/block.wast:188: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000022: end_function_body callback failed
+out/third_party/testsuite/block.wast:194: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000023: end_function_body callback failed
+out/third_party/testsuite/block.wast:200: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000024: end_function_body callback failed
+out/third_party/testsuite/block.wast:207: assert_invalid passed:
+  error: type stack at end of func is 1. expected 0
+  error: @0x00000024: end_function_body callback failed
+out/third_party/testsuite/block.wast:213: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000025: end_function_body callback failed
+out/third_party/testsuite/block.wast:220: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000026: end_function_body callback failed
+out/third_party/testsuite/block.wast:226: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000027: end_function_body callback failed
+out/third_party/testsuite/block.wast:233: assert_invalid passed:
+  error: type stack size too small at i32.ctz. got 0, expected at least 1
+  error: @0x0000001e: on_unary_expr callback failed
+out/third_party/testsuite/block.wast:240: assert_invalid passed:
+  error: type stack size too small at i64.ctz. got 0, expected at least 1
+  error: @0x0000001f: on_unary_expr callback failed
+out/third_party/testsuite/block.wast:246: assert_invalid passed:
+  error: type stack size too small at i64.ctz. got 0, expected at least 1
+  error: @0x00000020: on_unary_expr callback failed
+34/34 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/br.txt b/test/spec/br.txt
index 55118f97..8b3dc214 100644
--- a/test/spec/br.txt
+++ b/test/spec/br.txt
@@ -37,5 +37,23 @@ assert_invalid error:
   out/third_party/testsuite/br.wast:400:34: label variable out of range (max 1)
   (module (func $large-label (br 0x10000001)))
                                  ^^^^^^^^^^
-61/61 tests passed.
+out/third_party/testsuite/br.wast:372: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000020: end_function_body callback failed
+out/third_party/testsuite/br.wast:379: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000021: end_function_body callback failed
+out/third_party/testsuite/br.wast:385: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000022: end_function_body callback failed
+out/third_party/testsuite/br.wast:392: assert_invalid passed:
+  error: invalid depth: 1 (max 1)
+  error: @0x00000019: on_br_expr callback failed
+out/third_party/testsuite/br.wast:396: assert_invalid passed:
+  error: invalid depth: 5 (max 3)
+  error: @0x0000001d: on_br_expr callback failed
+out/third_party/testsuite/br.wast:400: assert_invalid passed:
+  error: invalid depth: 268435457 (max 1)
+  error: @0x0000001d: on_br_expr callback failed
+67/67 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/br_if.txt b/test/spec/br_if.txt
index 95db8453..023d45a8 100644
--- a/test/spec/br_if.txt
+++ b/test/spec/br_if.txt
@@ -141,5 +141,74 @@ assert_invalid error:
   out/third_party/testsuite/br_if.wast:288:37: label variable out of range (max 1)
   (module (func $large-label (br_if 0x10000001 (i32.const 1))))
                                     ^^^^^^^^^^
-34/34 tests passed.
+out/third_party/testsuite/br_if.wast:171: assert_invalid passed:
+  error: type stack size too small at i32.ctz. got 0, expected at least 1
+  error: @0x0000001e: on_unary_expr callback failed
+out/third_party/testsuite/br_if.wast:175: assert_invalid passed:
+  error: type stack size too small at i64.ctz. got 0, expected at least 1
+  error: @0x0000001e: on_unary_expr callback failed
+out/third_party/testsuite/br_if.wast:179: assert_invalid passed:
+  error: type stack size too small at f32.neg. got 0, expected at least 1
+  error: @0x0000001e: on_unary_expr callback failed
+out/third_party/testsuite/br_if.wast:183: assert_invalid passed:
+  error: type stack size too small at f64.neg. got 0, expected at least 1
+  error: @0x0000001e: on_unary_expr callback failed
+out/third_party/testsuite/br_if.wast:188: assert_invalid passed:
+  error: type stack size too small at i32.ctz. got 0, expected at least 1
+  error: @0x0000001e: on_unary_expr callback failed
+out/third_party/testsuite/br_if.wast:192: assert_invalid passed:
+  error: type mismatch in br_if, expected i32 but got i64.
+  error: @0x0000001d: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:196: assert_invalid passed:
+  error: type mismatch in br_if, expected i32 but got f32.
+  error: @0x00000020: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:200: assert_invalid passed:
+  error: type mismatch in br_if, expected i32 but got i64.
+  error: @0x0000001d: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:205: assert_invalid passed:
+  error: type stack size too small at br_if. got 0, expected at least 1
+  error: @0x0000001e: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:211: assert_invalid passed:
+  error: type stack size too small at br_if. got 0, expected at least 1
+  error: @0x0000001e: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:217: assert_invalid passed:
+  error: type stack at end of block is 1. expected 0
+  error: @0x00000020: on_end_expr callback failed
+out/third_party/testsuite/br_if.wast:223: assert_invalid passed:
+  error: type stack at end of block is 1. expected 0
+  error: @0x00000020: on_end_expr callback failed
+out/third_party/testsuite/br_if.wast:230: assert_invalid passed:
+  error: type stack size too small at br_if. got 0, expected at least 1
+  error: @0x0000001f: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:236: assert_invalid passed:
+  error: type stack size too small at br_if. got 0, expected at least 1
+  error: @0x0000001f: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:242: assert_invalid passed:
+  error: type mismatch in br_if, expected i32 but got i64.
+  error: @0x00000020: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:248: assert_invalid passed:
+  error: type mismatch in br_if, expected i32 but got i64.
+  error: @0x00000020: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:255: assert_invalid passed:
+  error: type stack size too small at br_if. got 0, expected at least 1
+  error: @0x0000001c: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:261: assert_invalid passed:
+  error: type mismatch in br_if, expected i32 but got i64.
+  error: @0x0000001d: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:267: assert_invalid passed:
+  error: type stack size too small at br_if. got 0, expected at least 1
+  error: @0x0000001f: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:273: assert_invalid passed:
+  error: type mismatch in br_if, expected i32 but got i64.
+  error: @0x00000020: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:280: assert_invalid passed:
+  error: invalid depth: 1 (max 1)
+  error: @0x0000001b: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:284: assert_invalid passed:
+  error: invalid depth: 5 (max 3)
+  error: @0x0000001f: on_br_if_expr callback failed
+out/third_party/testsuite/br_if.wast:288: assert_invalid passed:
+  error: invalid depth: 268435457 (max 1)
+  error: @0x0000001f: on_br_if_expr callback failed
+57/57 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/br_table.txt b/test/spec/br_table.txt
index 6893f922..e91ac406 100644
--- a/test/spec/br_table.txt
+++ b/test/spec/br_table.txt
@@ -69,5 +69,44 @@ assert_invalid error:
   out/third_party/testsuite/br_table.wast:1463:26: label variable out of range (max 2)
     (block (br_table 0 0 0x10000001 (i32.const 1)))
                          ^^^^^^^^^^
-143/143 tests passed.
+out/third_party/testsuite/br_table.wast:1386: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000023: end_function_body callback failed
+out/third_party/testsuite/br_table.wast:1393: assert_invalid passed:
+  error: type stack size too small at br_table. got 0, expected at least 1
+  error: @0x00000020: on_br_table_expr callback failed
+out/third_party/testsuite/br_table.wast:1399: assert_invalid passed:
+  error: type mismatch in br_table, expected i32 but got i64.
+  error: @0x00000023: on_br_table_expr callback failed
+out/third_party/testsuite/br_table.wast:1406: assert_invalid passed:
+  error: type stack size too small at br_table. got 0, expected at least 1
+  error: @0x0000001f: on_br_table_expr callback failed
+out/third_party/testsuite/br_table.wast:1412: assert_invalid passed:
+  error: type mismatch in br_table, expected i32 but got i64.
+  error: @0x0000001e: on_br_table_expr callback failed
+out/third_party/testsuite/br_table.wast:1418: assert_invalid passed:
+  error: type stack size too small at br_table. got 0, expected at least 1
+  error: @0x00000021: on_br_table_expr callback failed
+out/third_party/testsuite/br_table.wast:1424: assert_invalid passed:
+  error: type mismatch in br_table, expected i32 but got i64.
+  error: @0x00000022: on_br_table_expr callback failed
+out/third_party/testsuite/br_table.wast:1431: assert_invalid passed:
+  error: invalid depth: 2 (max 2)
+  error: @0x0000001f: on_br_table_expr callback failed
+out/third_party/testsuite/br_table.wast:1437: assert_invalid passed:
+  error: invalid depth: 5 (max 3)
+  error: @0x00000021: on_br_table_expr callback failed
+out/third_party/testsuite/br_table.wast:1443: assert_invalid passed:
+  error: invalid depth: 268435457 (max 2)
+  error: @0x00000024: on_br_table_expr callback failed
+out/third_party/testsuite/br_table.wast:1450: assert_invalid passed:
+  error: invalid depth: 2 (max 2)
+  error: @0x0000001f: on_br_table_expr callback failed
+out/third_party/testsuite/br_table.wast:1456: assert_invalid passed:
+  error: invalid depth: 5 (max 3)
+  error: @0x00000021: on_br_table_expr callback failed
+out/third_party/testsuite/br_table.wast:1462: assert_invalid passed:
+  error: invalid depth: 268435457 (max 2)
+  error: @0x00000024: on_br_table_expr callback failed
+156/156 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/call.txt b/test/spec/call.txt
index 361836d4..295f547d 100644
--- a/test/spec/call.txt
+++ b/test/spec/call.txt
@@ -65,5 +65,39 @@ assert_invalid error:
   out/third_party/testsuite/call.wast:231:35: function variable out of range (max 1)
   (module (func $large-func (call 1012321300)))
                                   ^^^^^^^^^^
-35/35 tests passed.
+out/third_party/testsuite/call.wast:151: assert_invalid passed:
+  error: type stack size too small at i32.eqz. got 0, expected at least 1
+  error: @0x0000001b: on_convert_expr callback failed
+out/third_party/testsuite/call.wast:158: assert_invalid passed:
+  error: type mismatch in i32.eqz, expected i32 but got i64.
+  error: @0x0000001f: on_convert_expr callback failed
+out/third_party/testsuite/call.wast:166: assert_invalid passed:
+  error: type stack size too small at call. got 0, expected at least 1
+  error: @0x0000001e: on_call_expr callback failed
+out/third_party/testsuite/call.wast:173: assert_invalid passed:
+  error: type stack size too small at call. got 0, expected at least 2
+  error: @0x0000001f: on_call_expr callback failed
+out/third_party/testsuite/call.wast:180: assert_invalid passed:
+  error: type stack at end of func is 1. expected 0
+  error: @0x0000001d: end_function_body callback failed
+out/third_party/testsuite/call.wast:187: assert_invalid passed:
+  error: type stack at end of func is 2. expected 0
+  error: @0x00000026: end_function_body callback failed
+out/third_party/testsuite/call.wast:195: assert_invalid passed:
+  error: type stack size too small at call. got 1, expected at least 2
+  error: @0x00000022: on_call_expr callback failed
+out/third_party/testsuite/call.wast:202: assert_invalid passed:
+  error: type stack size too small at call. got 1, expected at least 2
+  error: @0x00000022: on_call_expr callback failed
+out/third_party/testsuite/call.wast:209: assert_invalid passed:
+  error: type mismatch in call, expected f64 but got i32.
+  error: @0x0000002a: on_call_expr callback failed
+out/third_party/testsuite/call.wast:216: assert_invalid passed:
+  error: type mismatch in call, expected i32 but got f64.
+  error: @0x0000002a: on_call_expr callback failed
+out/third_party/testsuite/call.wast:227: assert_invalid passed:
+  error: @0x00000019: invalid call function index
+out/third_party/testsuite/call.wast:231: assert_invalid passed:
+  error: @0x0000001d: invalid call function index
+47/47 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/call_indirect.txt b/test/spec/call_indirect.txt
index dbdb2961..41bf0df0 100644
--- a/test/spec/call_indirect.txt
+++ b/test/spec/call_indirect.txt
@@ -93,5 +93,51 @@ assert_invalid error:
   out/third_party/testsuite/call_indirect.wast:366:34: function variable out of range (max 0)
   (module (table anyfunc (elem 0 0)))
                                  ^
-48/48 tests passed.
+out/third_party/testsuite/call_indirect.wast:229: assert_invalid passed:
+  error: found call_indirect operator, but no table
+  error: @0x0000001c: on_call_indirect_expr callback failed
+out/third_party/testsuite/call_indirect.wast:237: assert_invalid passed:
+  error: type stack size too small at i32.eqz. got 0, expected at least 1
+  error: @0x00000023: on_convert_expr callback failed
+out/third_party/testsuite/call_indirect.wast:245: assert_invalid passed:
+  error: type mismatch in i32.eqz, expected i32 but got i64.
+  error: @0x00000027: on_convert_expr callback failed
+out/third_party/testsuite/call_indirect.wast:254: assert_invalid passed:
+  error: type stack size too small at call_indirect. got 0, expected at least 1
+  error: @0x00000026: on_call_indirect_expr callback failed
+out/third_party/testsuite/call_indirect.wast:262: assert_invalid passed:
+  error: type stack size too small at call_indirect. got 0, expected at least 2
+  error: @0x00000027: on_call_indirect_expr callback failed
+out/third_party/testsuite/call_indirect.wast:270: assert_invalid passed:
+  error: type stack at end of func is 1. expected 0
+  error: @0x00000025: end_function_body callback failed
+out/third_party/testsuite/call_indirect.wast:278: assert_invalid passed:
+  error: type stack at end of func is 2. expected 0
+  error: @0x0000002e: end_function_body callback failed
+out/third_party/testsuite/call_indirect.wast:289: assert_invalid passed:
+  error: type stack size too small at call_indirect. got 0, expected at least 1
+  error: @0x00000027: on_call_indirect_expr callback failed
+out/third_party/testsuite/call_indirect.wast:297: assert_invalid passed:
+  error: type mismatch in call_indirect, expected i32 but got i64.
+  error: @0x00000028: on_call_indirect_expr callback failed
+out/third_party/testsuite/call_indirect.wast:306: assert_invalid passed:
+  error: type stack size too small at call_indirect. got 1, expected at least 2
+  error: @0x0000002a: on_call_indirect_expr callback failed
+out/third_party/testsuite/call_indirect.wast:316: assert_invalid passed:
+  error: type stack size too small at call_indirect. got 1, expected at least 2
+  error: @0x0000002a: on_call_indirect_expr callback failed
+out/third_party/testsuite/call_indirect.wast:326: assert_invalid passed:
+  error: type mismatch in call_indirect, expected f64 but got i32.
+  error: @0x00000032: on_call_indirect_expr callback failed
+out/third_party/testsuite/call_indirect.wast:336: assert_invalid passed:
+  error: type mismatch in call_indirect, expected i32 but got f64.
+  error: @0x00000032: on_call_indirect_expr callback failed
+out/third_party/testsuite/call_indirect.wast:350: assert_invalid passed:
+  error: @0x00000021: invalid call_indirect signature index
+out/third_party/testsuite/call_indirect.wast:357: assert_invalid passed:
+  error: @0x00000025: invalid call_indirect signature index
+out/third_party/testsuite/call_indirect.wast:366: assert_invalid passed:
+  error: invalid func_index: 0 (max 0)
+  error: @0x00000018: on_elem_segment_function_index callback failed
+64/64 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/exports.txt b/test/spec/exports.txt
index 034b6c23..d20d5aad 100644
--- a/test/spec/exports.txt
+++ b/test/spec/exports.txt
@@ -89,5 +89,67 @@ assert_invalid error:
   out/third_party/testsuite/exports.wast:194:64: redefinition of export "a"
 ... (memory 0) (table 0 anyfunc) (export "a" (memory 0)) (export "a" (table 0)))
                                                          ^^^^^^^^^^^^^^^^^^^^^^
-6/6 tests passed.
+out/third_party/testsuite/exports.wast:27: assert_invalid passed:
+  error: @0x00000019: invalid export func index: 1
+out/third_party/testsuite/exports.wast:31: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x0000001d: on_export callback failed
+out/third_party/testsuite/exports.wast:35: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x0000001e: on_export callback failed
+out/third_party/testsuite/exports.wast:39: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000025: on_export callback failed
+out/third_party/testsuite/exports.wast:43: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000023: on_export callback failed
+out/third_party/testsuite/exports.wast:47: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000022: on_export callback failed
+out/third_party/testsuite/exports.wast:76: assert_invalid passed:
+  error: @0x00000017: invalid export global index
+out/third_party/testsuite/exports.wast:80: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x0000001b: on_export callback failed
+out/third_party/testsuite/exports.wast:84: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000020: on_export callback failed
+out/third_party/testsuite/exports.wast:88: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000025: on_export callback failed
+out/third_party/testsuite/exports.wast:92: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000021: on_export callback failed
+out/third_party/testsuite/exports.wast:96: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000020: on_export callback failed
+out/third_party/testsuite/exports.wast:124: assert_invalid passed:
+  error: @0x00000015: invalid export table index
+out/third_party/testsuite/exports.wast:128: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000019: on_export callback failed
+out/third_party/testsuite/exports.wast:137: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000023: on_export callback failed
+out/third_party/testsuite/exports.wast:141: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000021: on_export callback failed
+out/third_party/testsuite/exports.wast:145: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x0000001e: on_export callback failed
+out/third_party/testsuite/exports.wast:173: assert_invalid passed:
+  error: @0x00000014: invalid export memory index
+out/third_party/testsuite/exports.wast:177: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000018: on_export callback failed
+out/third_party/testsuite/exports.wast:186: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000022: on_export callback failed
+out/third_party/testsuite/exports.wast:190: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x00000020: on_export callback failed
+out/third_party/testsuite/exports.wast:194: assert_invalid passed:
+  error: duplicate export "a"
+  error: @0x0000001e: on_export callback failed
+28/28 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/func.txt b/test/spec/func.txt
index a56a1f00..5323dce6 100644
--- a/test/spec/func.txt
+++ b/test/spec/func.txt
@@ -157,5 +157,93 @@ assert_invalid error:
   out/third_party/testsuite/func.wast:484:13: type mismatch at br value. got i64, expected i32
     (block (br 1 (i64.const 1))) (br 0 (i32.const 1))
             ^^^^
-66/66 tests passed.
+out/third_party/testsuite/func.wast:315: assert_invalid passed:
+  error: type mismatch in implicit return, expected i64 but got i32.
+  error: @0x0000001d: end_function_body callback failed
+out/third_party/testsuite/func.wast:319: assert_invalid passed:
+  error: type mismatch in i32.eqz, expected i32 but got f32.
+  error: @0x0000001c: on_convert_expr callback failed
+out/third_party/testsuite/func.wast:323: assert_invalid passed:
+  error: type mismatch in f64.neg, expected f64 but got i64.
+  error: @0x0000001e: on_unary_expr callback failed
+out/third_party/testsuite/func.wast:331: assert_invalid passed:
+  error: type mismatch in implicit return, expected i64 but got i32.
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/func.wast:335: assert_invalid passed:
+  error: type mismatch in i32.eqz, expected i32 but got f32.
+  error: @0x0000001b: on_convert_expr callback failed
+out/third_party/testsuite/func.wast:339: assert_invalid passed:
+  error: type mismatch in f64.neg, expected f64 but got i64.
+  error: @0x0000001c: on_unary_expr callback failed
+out/third_party/testsuite/func.wast:347: assert_invalid passed:
+  error: @0x0000000e: result count must be 0 or 1
+out/third_party/testsuite/func.wast:351: assert_invalid passed:
+  error: @0x0000000e: result count must be 0 or 1
+out/third_party/testsuite/func.wast:360: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000019: end_function_body callback failed
+out/third_party/testsuite/func.wast:364: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000019: end_function_body callback failed
+out/third_party/testsuite/func.wast:368: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000019: end_function_body callback failed
+out/third_party/testsuite/func.wast:372: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000019: end_function_body callback failed
+out/third_party/testsuite/func.wast:377: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001a: end_function_body callback failed
+out/third_party/testsuite/func.wast:383: assert_invalid passed:
+  error: type stack at end of func is 1. expected 0
+  error: @0x0000001a: end_function_body callback failed
+out/third_party/testsuite/func.wast:389: assert_invalid passed:
+  error: type mismatch in implicit return, expected i32 but got f32.
+  error: @0x0000001e: end_function_body callback failed
+out/third_party/testsuite/func.wast:396: assert_invalid passed:
+  error: type stack size too small at return. got 0, expected at least 1
+  error: @0x00000019: on_return_expr callback failed
+out/third_party/testsuite/func.wast:402: assert_invalid passed:
+  error: type stack size too small at return. got 0, expected at least 1
+  error: @0x0000001a: on_return_expr callback failed
+out/third_party/testsuite/func.wast:408: assert_invalid passed:
+  error: type mismatch in return, expected i32 but got i64.
+  error: @0x0000001b: on_return_expr callback failed
+out/third_party/testsuite/func.wast:415: assert_invalid passed:
+  error: type stack size too small at return. got 0, expected at least 1
+  error: @0x00000019: on_return_expr callback failed
+out/third_party/testsuite/func.wast:421: assert_invalid passed:
+  error: type stack size too small at return. got 0, expected at least 1
+  error: @0x0000001a: on_return_expr callback failed
+out/third_party/testsuite/func.wast:427: assert_invalid passed:
+  error: type mismatch in return, expected i32 but got i64.
+  error: @0x0000001b: on_return_expr callback failed
+out/third_party/testsuite/func.wast:433: assert_invalid passed:
+  error: type mismatch in return, expected i32 but got i64.
+  error: @0x0000001b: on_return_expr callback failed
+out/third_party/testsuite/func.wast:440: assert_invalid passed:
+  error: type stack size too small at br. got 0, expected at least 1
+  error: @0x0000001a: on_br_expr callback failed
+out/third_party/testsuite/func.wast:446: assert_invalid passed:
+  error: type mismatch in br, expected i32 but got f32.
+  error: @0x0000001f: on_br_expr callback failed
+out/third_party/testsuite/func.wast:452: assert_invalid passed:
+  error: type stack size too small at br. got 0, expected at least 1
+  error: @0x0000001a: on_br_expr callback failed
+out/third_party/testsuite/func.wast:458: assert_invalid passed:
+  error: type mismatch in br, expected i32 but got i64.
+  error: @0x0000001c: on_br_expr callback failed
+out/third_party/testsuite/func.wast:464: assert_invalid passed:
+  error: type mismatch in br, expected i32 but got i64.
+  error: @0x0000001c: on_br_expr callback failed
+out/third_party/testsuite/func.wast:471: assert_invalid passed:
+  error: type stack size too small at br. got 0, expected at least 1
+  error: @0x0000001c: on_br_expr callback failed
+out/third_party/testsuite/func.wast:477: assert_invalid passed:
+  error: type stack size too small at br. got 0, expected at least 1
+  error: @0x0000001d: on_br_expr callback failed
+out/third_party/testsuite/func.wast:483: assert_invalid passed:
+  error: type mismatch in br, expected i32 but got i64.
+  error: @0x0000001e: on_br_expr callback failed
+96/96 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/func_ptrs.txt b/test/spec/func_ptrs.txt
index 8ba810bb..49f2e428 100644
--- a/test/spec/func_ptrs.txt
+++ b/test/spec/func_ptrs.txt
@@ -31,5 +31,20 @@ assert_invalid error:
                                                           ^^
 called host spectest.print(i32:83) =>
 four(i32:83) =>
-26/26 tests passed.
+out/third_party/testsuite/func_ptrs.wast:31: assert_invalid passed:
+  error: @0x0000000b: elem section without table section
+out/third_party/testsuite/func_ptrs.wast:32: assert_invalid passed:
+  error: @0x00000015: elem section without table section
+out/third_party/testsuite/func_ptrs.wast:35: assert_invalid passed:
+  error: type mismatch in elem segment, expected i32 but got i64
+  error: @0x00000015: end_elem_segment_init_expr callback failed
+out/third_party/testsuite/func_ptrs.wast:39: assert_invalid passed:
+  error: @0x00000015: expected END opcode after initializer expression
+out/third_party/testsuite/func_ptrs.wast:43: assert_invalid passed:
+  error: @0x00000013: unexpected opcode in initializer expression: 1 (0x1)
+out/third_party/testsuite/func_ptrs.wast:47: assert_invalid passed:
+  error: @0x0000000c: invalid function signature index: 42
+out/third_party/testsuite/func_ptrs.wast:48: assert_invalid passed:
+  error: @0x0000001c: invalid import signature index
+33/33 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/get_local.txt b/test/spec/get_local.txt
index 9d3038a4..0cb64daf 100644
--- a/test/spec/get_local.txt
+++ b/test/spec/get_local.txt
@@ -65,5 +65,41 @@ assert_invalid error:
   out/third_party/testsuite/get_local.wast:145:69: local variable out of range (max 3)
   (module (func $large-mixed (param i64) (local i32 i64) (get_local 214324343)))
                                                                     ^^^^^^^^^
-10/10 tests passed.
+out/third_party/testsuite/get_local.wast:91: assert_invalid passed:
+  error: type mismatch in implicit return, expected i64 but got i32.
+  error: @0x0000001d: end_function_body callback failed
+out/third_party/testsuite/get_local.wast:95: assert_invalid passed:
+  error: type mismatch in i32.eqz, expected i32 but got f32.
+  error: @0x0000001c: on_convert_expr callback failed
+out/third_party/testsuite/get_local.wast:99: assert_invalid passed:
+  error: type mismatch in f64.neg, expected f64 but got i64.
+  error: @0x0000001e: on_unary_expr callback failed
+out/third_party/testsuite/get_local.wast:107: assert_invalid passed:
+  error: type mismatch in implicit return, expected i64 but got i32.
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/get_local.wast:111: assert_invalid passed:
+  error: type mismatch in i32.eqz, expected i32 but got f32.
+  error: @0x0000001b: on_convert_expr callback failed
+out/third_party/testsuite/get_local.wast:115: assert_invalid passed:
+  error: type mismatch in f64.neg, expected f64 but got i64.
+  error: @0x0000001c: on_unary_expr callback failed
+out/third_party/testsuite/get_local.wast:123: assert_invalid passed:
+  error: invalid local_index: 3 (max 2)
+  error: @0x0000001d: on_get_local_expr callback failed
+out/third_party/testsuite/get_local.wast:127: assert_invalid passed:
+  error: invalid local_index: 14324343 (max 2)
+  error: @0x00000020: on_get_local_expr callback failed
+out/third_party/testsuite/get_local.wast:132: assert_invalid passed:
+  error: invalid local_index: 2 (max 2)
+  error: @0x0000001b: on_get_local_expr callback failed
+out/third_party/testsuite/get_local.wast:136: assert_invalid passed:
+  error: invalid local_index: 714324343 (max 2)
+  error: @0x00000021: on_get_local_expr callback failed
+out/third_party/testsuite/get_local.wast:141: assert_invalid passed:
+  error: invalid local_index: 3 (max 3)
+  error: @0x0000001e: on_get_local_expr callback failed
+out/third_party/testsuite/get_local.wast:145: assert_invalid passed:
+  error: invalid local_index: 214324343 (max 3)
+  error: @0x00000021: on_get_local_expr callback failed
+22/22 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/globals.txt b/test/spec/globals.txt
index cd1557f2..2d8c7083 100644
--- a/test/spec/globals.txt
+++ b/test/spec/globals.txt
@@ -57,6 +57,34 @@ assert_malformed error:
   out/third_party/testsuite/globals.wast:145:4: error in binary module: @0x00000011: global mutability must be 0 or 1
   (module
    ^^^^^^
+out/third_party/testsuite/globals.wast:50: assert_invalid passed:
+  error: can't set_global on immutable global at index 0.
+  error: @0x00000026: on_set_global_expr callback failed
+out/third_party/testsuite/globals.wast:55: assert_invalid passed:
+  error: unknown import module "m"
+  error: @0x0000000f: on_import callback failed
+out/third_party/testsuite/globals.wast:60: assert_invalid passed:
+  error: unknown import module "m"
+  error: @0x0000000f: on_import callback failed
+out/third_party/testsuite/globals.wast:65: assert_invalid passed:
+  error: mutable globals cannot be exported
+  error: @0x0000001a: on_export callback failed
+out/third_party/testsuite/globals.wast:70: assert_invalid passed:
+  error: mutable globals cannot be exported
+  error: @0x0000001a: on_export callback failed
+out/third_party/testsuite/globals.wast:75: assert_invalid passed:
+  error: @0x00000013: expected END opcode after initializer expression
+out/third_party/testsuite/globals.wast:80: assert_invalid passed:
+  error: @0x0000000e: unexpected opcode in initializer expression: 32 (0x20)
+out/third_party/testsuite/globals.wast:85: assert_invalid passed:
+  error: type mismatch in global, expected i32 but got f32.
+  error: @0x00000013: end_global_init_expr callback failed
+out/third_party/testsuite/globals.wast:90: assert_invalid passed:
+  error: initializer expression can only reference an imported global
+  error: @0x0000000f: on_init_expr_get_global_expr callback failed
+out/third_party/testsuite/globals.wast:95: assert_invalid passed:
+  error: initializer expression can only reference an imported global
+  error: @0x0000000f: on_init_expr_get_global_expr callback failed
 out/third_party/testsuite/globals.wast:103: assert_malformed passed:
   error: @0x00000022: global mutability must be 0 or 1
 out/third_party/testsuite/globals.wast:116: assert_malformed passed:
@@ -65,5 +93,5 @@ out/third_party/testsuite/globals.wast:133: assert_malformed passed:
   error: @0x00000011: global mutability must be 0 or 1
 out/third_party/testsuite/globals.wast:145: assert_malformed passed:
   error: @0x00000011: global mutability must be 0 or 1
-20/20 tests passed.
+30/30 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/imports.txt b/test/spec/imports.txt
index 16e13cb9..d0f2dd53 100644
--- a/test/spec/imports.txt
+++ b/test/spec/imports.txt
@@ -131,6 +131,14 @@ out/third_party/testsuite/imports.wast:242: assert_unlinkable passed:
 out/third_party/testsuite/imports.wast:246: assert_unlinkable passed:
   error: unknown host global import "spectest.memory"
   error: @0x0000001e: on_import_global callback failed
+out/third_party/testsuite/imports.wast:288: assert_invalid passed:
+  error: unknown import module ""
+  error: @0x0000000d: on_import callback failed
+out/third_party/testsuite/imports.wast:292: assert_invalid passed:
+  error: unknown import module ""
+  error: @0x0000000d: on_import callback failed
+out/third_party/testsuite/imports.wast:296: assert_invalid passed:
+  error: @0x0000000b: table count (2) must be 0 or 1
 out/third_party/testsuite/imports.wast:313: assert_unlinkable passed:
   error: unknown module field "unknown"
   error: @0x00000018: on_import callback failed
@@ -161,6 +169,14 @@ out/third_party/testsuite/imports.wast:347: assert_unlinkable passed:
 out/third_party/testsuite/imports.wast:351: assert_unlinkable passed:
   error: unknown host table import "spectest.print"
   error: @0x0000001e: on_import_table callback failed
+out/third_party/testsuite/imports.wast:383: assert_invalid passed:
+  error: unknown import module ""
+  error: @0x0000000d: on_import callback failed
+out/third_party/testsuite/imports.wast:387: assert_invalid passed:
+  error: unknown import module ""
+  error: @0x0000000d: on_import callback failed
+out/third_party/testsuite/imports.wast:391: assert_invalid passed:
+  error: @0x0000000b: memory count must be 0 or 1
 out/third_party/testsuite/imports.wast:406: assert_unlinkable passed:
   error: unknown module field "unknown"
   error: @0x00000018: on_import callback failed
@@ -203,5 +219,5 @@ out/third_party/testsuite/imports.wast:457: assert_unlinkable passed:
 out/third_party/testsuite/imports.wast:461: assert_unlinkable passed:
   error: max size (2) larger than declared (1)
   error: @0x0000001f: on_import_memory callback failed
-85/85 tests passed.
+91/91 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/labels.txt b/test/spec/labels.txt
index 577eaf84..5246d063 100644
--- a/test/spec/labels.txt
+++ b/test/spec/labels.txt
@@ -17,5 +17,14 @@ assert_invalid error:
   out/third_party/testsuite/labels.wast:306:18: type stack at end of block is 1. expected 0
   (module (func (block $l (br_if $l (f32.const 0) (i32.const 1)))))
                  ^^^^^
-24/24 tests passed.
+out/third_party/testsuite/labels.wast:298: assert_invalid passed:
+  error: type stack size too small at f32.neg. got 0, expected at least 1
+  error: @0x0000001e: on_unary_expr callback failed
+out/third_party/testsuite/labels.wast:302: assert_invalid passed:
+  error: type stack at end of block is 1. expected 0
+  error: @0x00000023: on_end_expr callback failed
+out/third_party/testsuite/labels.wast:306: assert_invalid passed:
+  error: type stack at end of block is 1. expected 0
+  error: @0x00000023: on_end_expr callback failed
+27/27 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/linking.txt b/test/spec/linking.txt
index 743673f4..184401d3 100644
--- a/test/spec/linking.txt
+++ b/test/spec/linking.txt
@@ -17,6 +17,7 @@ out/third_party/testsuite/linking.wast:183: assert_unlinkable passed:
   error: data segment is out of bounds: [65536, 65537) >= max value 65536
   error: @0x00000042: on_data_segment_data callback failed
 out/third_party/testsuite/linking.wast:255: assert_unlinkable passed:
+  error: duplicate export "print"
   error: unknown module field "tab"
   error: @0x00000033: on_import callback failed
 out/third_party/testsuite/linking.wast:266: assert_unlinkable passed:
diff --git a/test/spec/loop.txt b/test/spec/loop.txt
index 422fd463..e5072585 100644
--- a/test/spec/loop.txt
+++ b/test/spec/loop.txt
@@ -53,5 +53,23 @@ assert_invalid error:
   out/third_party/testsuite/loop.wast:249:11: type stack at end of function is 0. expected 1
   (module (func $type-value-num-vs-num (result i32)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-42/42 tests passed.
+out/third_party/testsuite/loop.wast:226: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/loop.wast:230: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/loop.wast:234: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/loop.wast:238: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/loop.wast:243: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001d: end_function_body callback failed
+out/third_party/testsuite/loop.wast:249: assert_invalid passed:
+  error: type stack at end of loop is 1. expected 0
+  error: @0x00000020: on_end_expr callback failed
+48/48 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/memory.txt b/test/spec/memory.txt
index 4564377c..72e4c18a 100644
--- a/test/spec/memory.txt
+++ b/test/spec/memory.txt
@@ -137,6 +137,42 @@ assert_invalid error:
   out/third_party/testsuite/memory.wast:183:29: alignment must not be larger than natural alignment (1)
   (module (memory 0) (func (i32.store8 align=2 (i32.const 0) (i32.const 0))))
                             ^^^^^^^^^^^^^^^^^^
+out/third_party/testsuite/memory.wast:19: assert_invalid passed:
+  error: @0x0000000b: memory count must be 0 or 1
+out/third_party/testsuite/memory.wast:20: assert_invalid passed:
+  error: only one memory allowed
+  error: @0x00000023: on_memory callback failed
+out/third_party/testsuite/memory.wast:29: assert_invalid passed:
+  error: @0x0000000b: data section without memory section
+out/third_party/testsuite/memory.wast:30: assert_invalid passed:
+  error: @0x0000000b: data section without memory section
+out/third_party/testsuite/memory.wast:31: assert_invalid passed:
+  error: @0x0000000b: data section without memory section
+out/third_party/testsuite/memory.wast:34: assert_invalid passed:
+  error: f32.load requires an imported or defined memory.
+  error: @0x0000001c: on_load_expr callback failed
+out/third_party/testsuite/memory.wast:38: assert_invalid passed:
+  error: f32.store requires an imported or defined memory.
+  error: @0x00000021: on_store_expr callback failed
+out/third_party/testsuite/memory.wast:42: assert_invalid passed:
+  error: i32.load8_s requires an imported or defined memory.
+  error: @0x0000001c: on_load_expr callback failed
+out/third_party/testsuite/memory.wast:46: assert_invalid passed:
+  error: i32.store8 requires an imported or defined memory.
+  error: @0x0000001e: on_store_expr callback failed
+out/third_party/testsuite/memory.wast:50: assert_invalid passed:
+  error: current_memory requires an imported or defined memory.
+  error: @0x00000019: on_current_memory_expr callback failed
+out/third_party/testsuite/memory.wast:54: assert_invalid passed:
+  error: grow_memory requires an imported or defined memory.
+  error: @0x0000001b: on_grow_memory_expr callback failed
+out/third_party/testsuite/memory.wast:59: assert_invalid passed:
+  error: type mismatch in data segment, expected i32 but got i64
+  error: @0x00000015: on_data_segment_data callback failed
+out/third_party/testsuite/memory.wast:63: assert_invalid passed:
+  error: @0x00000014: expected END opcode after initializer expression
+out/third_party/testsuite/memory.wast:67: assert_invalid passed:
+  error: @0x00000012: unexpected opcode in initializer expression: 1 (0x1)
 out/third_party/testsuite/memory.wast:77: assert_unlinkable passed:
   error: data segment is out of bounds: [0, 1) >= max value 0
   error: @0x00000017: on_data_segment_data callback failed
@@ -153,7 +189,49 @@ out/third_party/testsuite/memory.wast:93: assert_unlinkable passed:
   error: data segment is out of bounds: [73728, 73728) >= max value 65536
   error: @0x00000017: on_data_segment_data callback failed
 out/third_party/testsuite/memory.wast:102: assert_unlinkable passed:
+  error: duplicate export "global"
   error: data segment is out of bounds: [666, 667) >= max value 0
   error: @0x0000002c: on_data_segment_data callback failed
-33/33 tests passed.
+out/third_party/testsuite/memory.wast:116: assert_invalid passed:
+  error: @0x0000000e: memory initial size must be <= max size
+out/third_party/testsuite/memory.wast:120: assert_invalid passed:
+  error: @0x0000000f: invalid memory initial size
+out/third_party/testsuite/memory.wast:124: assert_invalid passed:
+  error: @0x00000011: invalid memory initial size
+out/third_party/testsuite/memory.wast:128: assert_invalid passed:
+  error: @0x00000011: invalid memory initial size
+out/third_party/testsuite/memory.wast:132: assert_invalid passed:
+  error: @0x00000010: invalid memory max size
+out/third_party/testsuite/memory.wast:136: assert_invalid passed:
+  error: @0x00000012: invalid memory max size
+out/third_party/testsuite/memory.wast:140: assert_invalid passed:
+  error: @0x00000012: invalid memory max size
+out/third_party/testsuite/memory.wast:151: assert_invalid passed:
+  error: alignment must not be larger than natural alignment (8)
+  error: @0x00000021: on_load_expr callback failed
+out/third_party/testsuite/memory.wast:155: assert_invalid passed:
+  error: alignment must not be larger than natural alignment (8)
+  error: @0x00000021: on_load_expr callback failed
+out/third_party/testsuite/memory.wast:159: assert_invalid passed:
+  error: alignment must not be larger than natural alignment (4)
+  error: @0x00000021: on_load_expr callback failed
+out/third_party/testsuite/memory.wast:163: assert_invalid passed:
+  error: alignment must not be larger than natural alignment (2)
+  error: @0x00000021: on_load_expr callback failed
+out/third_party/testsuite/memory.wast:167: assert_invalid passed:
+  error: alignment must not be larger than natural alignment (1)
+  error: @0x00000021: on_load_expr callback failed
+out/third_party/testsuite/memory.wast:171: assert_invalid passed:
+  error: alignment must not be larger than natural alignment (1)
+  error: @0x00000023: on_store_expr callback failed
+out/third_party/testsuite/memory.wast:175: assert_invalid passed:
+  error: alignment must not be larger than natural alignment (2)
+  error: @0x00000021: on_load_expr callback failed
+out/third_party/testsuite/memory.wast:179: assert_invalid passed:
+  error: alignment must not be larger than natural alignment (1)
+  error: @0x00000021: on_load_expr callback failed
+out/third_party/testsuite/memory.wast:183: assert_invalid passed:
+  error: alignment must not be larger than natural alignment (1)
+  error: @0x00000023: on_store_expr callback failed
+63/63 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/nop.txt b/test/spec/nop.txt
index ee9328a7..bf56cfd9 100644
--- a/test/spec/nop.txt
+++ b/test/spec/nop.txt
@@ -33,5 +33,17 @@ assert_invalid error:
   out/third_party/testsuite/nop.wast:258:11: type stack at end of function is 0. expected 1
   (module (func $type-f64 (result f64) (nop)))
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-50/50 tests passed.
+out/third_party/testsuite/nop.wast:246: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001a: end_function_body callback failed
+out/third_party/testsuite/nop.wast:250: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001a: end_function_body callback failed
+out/third_party/testsuite/nop.wast:254: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001a: end_function_body callback failed
+out/third_party/testsuite/nop.wast:258: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001a: end_function_body callback failed
+54/54 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/return.txt b/test/spec/return.txt
index d0912be0..e98573b3 100644
--- a/test/spec/return.txt
+++ b/test/spec/return.txt
@@ -13,5 +13,14 @@ assert_invalid error:
   out/third_party/testsuite/return.wast:278:54: type mismatch at return. got i64, expected f64
   (module (func $type-value-num-vs-num (result f64) (return (i64.const 1))))
                                                      ^^^^^^
-57/57 tests passed.
+out/third_party/testsuite/return.wast:270: assert_invalid passed:
+  error: type stack size too small at return. got 0, expected at least 1
+  error: @0x00000019: on_return_expr callback failed
+out/third_party/testsuite/return.wast:274: assert_invalid passed:
+  error: type stack size too small at return. got 0, expected at least 1
+  error: @0x0000001a: on_return_expr callback failed
+out/third_party/testsuite/return.wast:278: assert_invalid passed:
+  error: type mismatch in return, expected f64 but got i64.
+  error: @0x0000001b: on_return_expr callback failed
+60/60 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/select.txt b/test/spec/select.txt
index 735bd990..c9ebe37b 100644
--- a/test/spec/select.txt
+++ b/test/spec/select.txt
@@ -5,5 +5,8 @@ assert_invalid error:
   out/third_party/testsuite/select.wast:55:27: type stack size too small at select. got 0, expected at least 2
   (module (func $arity-0 (select (nop) (nop) (i32.const 1))))
                           ^^^^^^
-28/28 tests passed.
+out/third_party/testsuite/select.wast:55: assert_invalid passed:
+  error: type stack size too small at select. got 0, expected at least 2
+  error: @0x0000001c: on_select_expr callback failed
+29/29 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/set_local.txt b/test/spec/set_local.txt
index 01b0a323..773afde8 100644
--- a/test/spec/set_local.txt
+++ b/test/spec/set_local.txt
@@ -113,5 +113,74 @@ assert_invalid error:
   out/third_party/testsuite/set_local.wast:202:73: type mismatch at set_local. got i64, expected f64
 ...ixed-arg-num-vs-num (param i64) (local f64 i64) (set_local 1 (i64.const 0))))
                                                     ^^^^^^^^^^^
-10/10 tests passed.
+out/third_party/testsuite/set_local.wast:95: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001f: end_function_body callback failed
+out/third_party/testsuite/set_local.wast:101: assert_invalid passed:
+  error: type stack size too small at i32.eqz. got 0, expected at least 1
+  error: @0x00000021: on_convert_expr callback failed
+out/third_party/testsuite/set_local.wast:107: assert_invalid passed:
+  error: type stack size too small at f64.neg. got 0, expected at least 1
+  error: @0x00000020: on_unary_expr callback failed
+out/third_party/testsuite/set_local.wast:114: assert_invalid passed:
+  error: type stack size too small at set_local. got 0, expected at least 1
+  error: @0x0000001c: on_set_local_expr callback failed
+out/third_party/testsuite/set_local.wast:118: assert_invalid passed:
+  error: type mismatch in set_local, expected i32 but got f32.
+  error: @0x00000020: on_set_local_expr callback failed
+out/third_party/testsuite/set_local.wast:122: assert_invalid passed:
+  error: type mismatch in set_local, expected f32 but got f64.
+  error: @0x00000024: on_set_local_expr callback failed
+out/third_party/testsuite/set_local.wast:126: assert_invalid passed:
+  error: type mismatch in set_local, expected i64 but got f64.
+  error: @0x00000026: on_set_local_expr callback failed
+out/third_party/testsuite/set_local.wast:134: assert_invalid passed:
+  error: type mismatch in implicit return, expected i64 but got i32.
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/set_local.wast:138: assert_invalid passed:
+  error: type mismatch in i32.eqz, expected i32 but got f32.
+  error: @0x0000001b: on_convert_expr callback failed
+out/third_party/testsuite/set_local.wast:142: assert_invalid passed:
+  error: type mismatch in f64.neg, expected f64 but got i64.
+  error: @0x0000001c: on_unary_expr callback failed
+out/third_party/testsuite/set_local.wast:147: assert_invalid passed:
+  error: type stack size too small at set_local. got 0, expected at least 1
+  error: @0x0000001b: on_set_local_expr callback failed
+out/third_party/testsuite/set_local.wast:151: assert_invalid passed:
+  error: type mismatch in set_local, expected i32 but got f32.
+  error: @0x0000001f: on_set_local_expr callback failed
+out/third_party/testsuite/set_local.wast:155: assert_invalid passed:
+  error: type mismatch in set_local, expected f32 but got f64.
+  error: @0x00000023: on_set_local_expr callback failed
+out/third_party/testsuite/set_local.wast:159: assert_invalid passed:
+  error: type mismatch in set_local, expected i64 but got f64.
+  error: @0x00000024: on_set_local_expr callback failed
+out/third_party/testsuite/set_local.wast:167: assert_invalid passed:
+  error: invalid local_index: 3 (max 2)
+  error: @0x0000001d: on_get_local_expr callback failed
+out/third_party/testsuite/set_local.wast:171: assert_invalid passed:
+  error: invalid local_index: 14324343 (max 2)
+  error: @0x00000020: on_get_local_expr callback failed
+out/third_party/testsuite/set_local.wast:176: assert_invalid passed:
+  error: invalid local_index: 2 (max 2)
+  error: @0x0000001b: on_get_local_expr callback failed
+out/third_party/testsuite/set_local.wast:180: assert_invalid passed:
+  error: invalid local_index: 714324343 (max 2)
+  error: @0x00000021: on_get_local_expr callback failed
+out/third_party/testsuite/set_local.wast:185: assert_invalid passed:
+  error: invalid local_index: 3 (max 3)
+  error: @0x0000001e: on_get_local_expr callback failed
+out/third_party/testsuite/set_local.wast:189: assert_invalid passed:
+  error: invalid local_index: 214324343 (max 3)
+  error: @0x00000021: on_get_local_expr callback failed
+out/third_party/testsuite/set_local.wast:194: assert_invalid passed:
+  error: type mismatch in set_local, expected i32 but got f32.
+  error: @0x00000021: on_set_local_expr callback failed
+out/third_party/testsuite/set_local.wast:198: assert_invalid passed:
+  error: type mismatch in set_local, expected i32 but got f32.
+  error: @0x00000022: on_set_local_expr callback failed
+out/third_party/testsuite/set_local.wast:202: assert_invalid passed:
+  error: type mismatch in set_local, expected f64 but got i64.
+  error: @0x00000020: on_set_local_expr callback failed
+33/33 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/start.txt b/test/spec/start.txt
index 3ba46c1c..70cbb90e 100644
--- a/test/spec/start.txt
+++ b/test/spec/start.txt
@@ -13,6 +13,14 @@ assert_invalid error:
   out/third_party/testsuite/start.wast:16:5: start function must be nullary
     (start $main)
     ^^^^^^^^^^^^^
+out/third_party/testsuite/start.wast:2: assert_invalid passed:
+  error: @0x00000015: invalid start function index
+out/third_party/testsuite/start.wast:7: assert_invalid passed:
+  error: start function must not return anything
+  error: @0x00000016: on_start_function callback failed
+out/third_party/testsuite/start.wast:14: assert_invalid passed:
+  error: start function must be nullary
+  error: @0x00000016: on_start_function callback failed
 inc() =>
 inc() =>
 inc() =>
@@ -20,5 +28,5 @@ inc() =>
 called host spectest.print(i32:1) =>
 called host spectest.print(i32:2) =>
 called host spectest.print() =>
-11/11 tests passed.
+14/14 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/store_retval.txt b/test/spec/store_retval.txt
index 7110de0e..942acdfb 100644
--- a/test/spec/store_retval.txt
+++ b/test/spec/store_retval.txt
@@ -105,5 +105,44 @@ assert_invalid error:
   out/third_party/testsuite/store_retval.wast:52:22: type stack at end of function is 0. expected 1
 ...1) (func (param i64) (result i64) (i64.store32 (i32.const 0) (i64.const 1))))
       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-0/0 tests passed.
+out/third_party/testsuite/store_retval.wast:2: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001e: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:6: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000001e: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:10: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000021: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:14: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000025: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:19: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000026: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:23: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000026: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:27: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000029: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:31: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x0000002d: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:36: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000026: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:40: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000026: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:44: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000026: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:48: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000026: end_function_body callback failed
+out/third_party/testsuite/store_retval.wast:52: assert_invalid passed:
+  error: type stack size too small at implicit return. got 0, expected at least 1
+  error: @0x00000026: end_function_body callback failed
+13/13 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/switch.txt b/test/spec/switch.txt
index 3ce64026..dcb6b332 100644
--- a/test/spec/switch.txt
+++ b/test/spec/switch.txt
@@ -5,5 +5,8 @@ assert_invalid error:
   out/third_party/testsuite/switch.wast:150:41: label variable out of range (max 1)
 (assert_invalid (module (func (br_table 3 (i32.const 0)))) "unknown label")
                                         ^
-26/26 tests passed.
+out/third_party/testsuite/switch.wast:150: assert_invalid passed:
+  error: invalid depth: 3 (max 1)
+  error: @0x0000001c: on_br_table_expr callback failed
+27/27 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/tee_local.txt b/test/spec/tee_local.txt
index 7d770e5a..bd2990b5 100644
--- a/test/spec/tee_local.txt
+++ b/test/spec/tee_local.txt
@@ -109,5 +109,74 @@ assert_invalid error:
   out/third_party/testsuite/tee_local.wast:233:11: type stack at end of function is 1. expected 0
   (module (func $type-mixed-arg-num-vs-num (param i64) (local f64 i64) (tee_l...
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-11/11 tests passed.
+out/third_party/testsuite/tee_local.wast:132: assert_invalid passed:
+  error: type mismatch in implicit return, expected i64 but got i32.
+  error: @0x0000001f: end_function_body callback failed
+out/third_party/testsuite/tee_local.wast:136: assert_invalid passed:
+  error: type mismatch in i32.eqz, expected i32 but got f32.
+  error: @0x00000021: on_convert_expr callback failed
+out/third_party/testsuite/tee_local.wast:140: assert_invalid passed:
+  error: type mismatch in f64.neg, expected f64 but got i64.
+  error: @0x00000020: on_unary_expr callback failed
+out/third_party/testsuite/tee_local.wast:145: assert_invalid passed:
+  error: type stack size too small at tee_local. got 0, expected at least 1
+  error: @0x0000001c: on_tee_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:149: assert_invalid passed:
+  error: type mismatch in tee_local, expected i32 but got f32.
+  error: @0x00000020: on_tee_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:153: assert_invalid passed:
+  error: type mismatch in tee_local, expected f32 but got f64.
+  error: @0x00000024: on_tee_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:157: assert_invalid passed:
+  error: type mismatch in tee_local, expected i64 but got f64.
+  error: @0x00000026: on_tee_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:165: assert_invalid passed:
+  error: type mismatch in implicit return, expected i64 but got i32.
+  error: @0x0000001c: end_function_body callback failed
+out/third_party/testsuite/tee_local.wast:169: assert_invalid passed:
+  error: type mismatch in i32.eqz, expected i32 but got f32.
+  error: @0x0000001b: on_convert_expr callback failed
+out/third_party/testsuite/tee_local.wast:173: assert_invalid passed:
+  error: type mismatch in f64.neg, expected f64 but got i64.
+  error: @0x0000001c: on_unary_expr callback failed
+out/third_party/testsuite/tee_local.wast:178: assert_invalid passed:
+  error: type stack size too small at tee_local. got 0, expected at least 1
+  error: @0x0000001b: on_tee_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:182: assert_invalid passed:
+  error: type mismatch in tee_local, expected i32 but got f32.
+  error: @0x0000001f: on_tee_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:186: assert_invalid passed:
+  error: type mismatch in tee_local, expected f32 but got f64.
+  error: @0x00000023: on_tee_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:190: assert_invalid passed:
+  error: type mismatch in tee_local, expected i64 but got f64.
+  error: @0x00000024: on_tee_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:198: assert_invalid passed:
+  error: invalid local_index: 3 (max 2)
+  error: @0x0000001d: on_get_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:202: assert_invalid passed:
+  error: invalid local_index: 14324343 (max 2)
+  error: @0x00000020: on_get_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:207: assert_invalid passed:
+  error: invalid local_index: 2 (max 2)
+  error: @0x0000001b: on_get_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:211: assert_invalid passed:
+  error: invalid local_index: 714324343 (max 2)
+  error: @0x00000021: on_get_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:216: assert_invalid passed:
+  error: invalid local_index: 3 (max 3)
+  error: @0x0000001e: on_get_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:220: assert_invalid passed:
+  error: invalid local_index: 214324343 (max 3)
+  error: @0x00000021: on_get_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:225: assert_invalid passed:
+  error: type mismatch in tee_local, expected i32 but got f32.
+  error: @0x00000021: on_tee_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:229: assert_invalid passed:
+  error: type mismatch in tee_local, expected i32 but got f32.
+  error: @0x00000022: on_tee_local_expr callback failed
+out/third_party/testsuite/tee_local.wast:233: assert_invalid passed:
+  error: type mismatch in tee_local, expected f64 but got i64.
+  error: @0x00000020: on_tee_local_expr callback failed
+34/34 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/typecheck.txt b/test/spec/typecheck.txt
index 671ff210..09eb6ec3 100644
--- a/test/spec/typecheck.txt
+++ b/test/spec/typecheck.txt
@@ -1749,5 +1749,584 @@ assert_invalid error:
   out/third_party/testsuite/typecheck.wast:425:36: type stack at end of function is 1. expected 0
 ...valid (module (memory 1) (func (grow_memory (f32.const 0)))) "type mismatch")
                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-0/0 tests passed.
+out/third_party/testsuite/typecheck.wast:4: assert_invalid passed:
+  error: type stack size too small at i32.eqz. got 0, expected at least 1
+  error: @0x00000018: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:10: assert_invalid passed:
+  error: type stack size too small at i32.eqz. got 0, expected at least 1
+  error: @0x0000001c: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:17: assert_invalid passed:
+  error: type stack size too small at i32.eqz. got 0, expected at least 1
+  error: @0x0000001c: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:24: assert_invalid passed:
+  error: type stack size too small at i32.eqz. got 0, expected at least 1
+  error: @0x0000001e: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:31: assert_invalid passed:
+  error: type stack size too small at i32.eqz. got 0, expected at least 1
+  error: @0x00000021: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:39: assert_invalid passed:
+  error: type stack size too small at i32.add. got 0, expected at least 2
+  error: @0x00000018: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:45: assert_invalid passed:
+  error: type stack size too small at i32.add. got 1, expected at least 2
+  error: @0x0000001a: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:51: assert_invalid passed:
+  error: type stack size too small at i32.add. got 0, expected at least 2
+  error: @0x0000001e: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:58: assert_invalid passed:
+  error: type stack size too small at i32.add. got 1, expected at least 2
+  error: @0x0000001e: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:65: assert_invalid passed:
+  error: type stack size too small at i32.add. got 0, expected at least 2
+  error: @0x0000001e: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:72: assert_invalid passed:
+  error: type stack size too small at i32.add. got 1, expected at least 2
+  error: @0x0000001e: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:79: assert_invalid passed:
+  error: type stack size too small at drop. got 0, expected at least 1
+  error: @0x00000021: on_drop_expr callback failed
+out/third_party/testsuite/typecheck.wast:86: assert_invalid passed:
+  error: type stack size too small at i32.add. got 0, expected at least 2
+  error: @0x00000020: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:93: assert_invalid passed:
+  error: type stack size too small at i32.add. got 0, expected at least 2
+  error: @0x00000023: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:101: assert_invalid passed:
+  error: type stack size too small at i32.add. got 0, expected at least 2
+  error: @0x00000021: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:110: assert_invalid passed:
+  error: type stack size too small at if. got 0, expected at least 1
+  error: @0x00000019: on_if_expr callback failed
+out/third_party/testsuite/typecheck.wast:116: assert_invalid passed:
+  error: type stack size too small at if. got 0, expected at least 1
+  error: @0x0000001d: on_if_expr callback failed
+out/third_party/testsuite/typecheck.wast:123: assert_invalid passed:
+  error: type stack size too small at if. got 0, expected at least 1
+  error: @0x0000001d: on_if_expr callback failed
+out/third_party/testsuite/typecheck.wast:130: assert_invalid passed:
+  error: type stack size too small at if. got 0, expected at least 1
+  error: @0x0000001f: on_if_expr callback failed
+out/third_party/testsuite/typecheck.wast:137: assert_invalid passed:
+  error: type stack size too small at if. got 0, expected at least 1
+  error: @0x00000022: on_if_expr callback failed
+out/third_party/testsuite/typecheck.wast:146: assert_invalid passed:
+  error: type stack size too small at br. got 0, expected at least 1
+  error: @0x0000001b: on_br_expr callback failed
+out/third_party/testsuite/typecheck.wast:153: assert_invalid passed:
+  error: type stack size too small at br. got 0, expected at least 1
+  error: @0x0000001d: on_br_expr callback failed
+out/third_party/testsuite/typecheck.wast:161: assert_invalid passed:
+  error: type stack size too small at br. got 0, expected at least 1
+  error: @0x00000021: on_br_expr callback failed
+out/third_party/testsuite/typecheck.wast:171: assert_invalid passed:
+  error: type stack size too small at br. got 0, expected at least 1
+  error: @0x00000024: on_br_expr callback failed
+out/third_party/testsuite/typecheck.wast:182: assert_invalid passed:
+  error: type stack size too small at return. got 0, expected at least 1
+  error: @0x00000019: on_return_expr callback failed
+out/third_party/testsuite/typecheck.wast:188: assert_invalid passed:
+  error: type stack size too small at return. got 0, expected at least 1
+  error: @0x0000001d: on_return_expr callback failed
+out/third_party/testsuite/typecheck.wast:195: assert_invalid passed:
+  error: type stack size too small at return. got 0, expected at least 1
+  error: @0x0000001d: on_return_expr callback failed
+out/third_party/testsuite/typecheck.wast:202: assert_invalid passed:
+  error: type stack size too small at return. got 0, expected at least 1
+  error: @0x0000001f: on_return_expr callback failed
+out/third_party/testsuite/typecheck.wast:209: assert_invalid passed:
+  error: type stack size too small at return. got 0, expected at least 1
+  error: @0x00000022: on_return_expr callback failed
+out/third_party/testsuite/typecheck.wast:219: assert_invalid passed:
+  error: type mismatch in if, expected i32 but got f32.
+  error: @0x0000001e: on_if_expr callback failed
+out/third_party/testsuite/typecheck.wast:222: assert_invalid passed:
+  error: type mismatch in br_if, expected i32 but got f32.
+  error: @0x00000020: on_br_if_expr callback failed
+out/third_party/testsuite/typecheck.wast:226: assert_invalid passed:
+  error: type mismatch in br_table, expected i32 but got f32.
+  error: @0x00000021: on_br_table_expr callback failed
+out/third_party/testsuite/typecheck.wast:230: assert_invalid passed:
+  error: type mismatch in call, expected i32 but got f32.
+  error: @0x00000026: on_call_expr callback failed
+out/third_party/testsuite/typecheck.wast:232: assert_invalid passed:
+  error: type mismatch in call_indirect, expected i32 but got f32.
+  error: @0x0000002f: on_call_indirect_expr callback failed
+out/third_party/testsuite/typecheck.wast:242: assert_invalid passed:
+  error: type mismatch in call_indirect, expected i32 but got f32.
+  error: @0x00000029: on_call_indirect_expr callback failed
+out/third_party/testsuite/typecheck.wast:250: assert_invalid passed:
+  error: type mismatch in return, expected i32 but got f32.
+  error: @0x0000001e: on_return_expr callback failed
+out/third_party/testsuite/typecheck.wast:253: assert_invalid passed:
+  error: type mismatch in set_local, expected i32 but got f32.
+  error: @0x00000020: on_set_local_expr callback failed
+out/third_party/testsuite/typecheck.wast:256: assert_invalid passed:
+  error: type mismatch in i32.load, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:257: assert_invalid passed:
+  error: type mismatch in i32.load8_s, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:258: assert_invalid passed:
+  error: type mismatch in i32.load8_u, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:259: assert_invalid passed:
+  error: type mismatch in i32.load16_s, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:260: assert_invalid passed:
+  error: type mismatch in i32.load16_u, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:261: assert_invalid passed:
+  error: type mismatch in i64.load, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:262: assert_invalid passed:
+  error: type mismatch in i64.load8_s, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:263: assert_invalid passed:
+  error: type mismatch in i64.load8_u, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:264: assert_invalid passed:
+  error: type mismatch in i64.load16_s, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:265: assert_invalid passed:
+  error: type mismatch in i64.load16_u, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:266: assert_invalid passed:
+  error: type mismatch in i64.load32_s, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:267: assert_invalid passed:
+  error: type mismatch in i64.load32_u, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:268: assert_invalid passed:
+  error: type mismatch in f32.load, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:269: assert_invalid passed:
+  error: type mismatch in f64.load, expected i32 but got f32.
+  error: @0x00000024: on_load_expr callback failed
+out/third_party/testsuite/typecheck.wast:272: assert_invalid passed:
+  error: type mismatch in i32.store, expected i32 but got f32.
+  error: @0x00000026: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:273: assert_invalid passed:
+  error: type mismatch in i32.store8, expected i32 but got f32.
+  error: @0x00000026: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:274: assert_invalid passed:
+  error: type mismatch in i32.store16, expected i32 but got f32.
+  error: @0x00000026: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:275: assert_invalid passed:
+  error: type mismatch in i64.store, expected i32 but got f32.
+  error: @0x00000026: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:276: assert_invalid passed:
+  error: type mismatch in i64.store8, expected i32 but got f32.
+  error: @0x00000026: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:277: assert_invalid passed:
+  error: type mismatch in i64.store16, expected i32 but got f32.
+  error: @0x00000026: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:278: assert_invalid passed:
+  error: type mismatch in i64.store32, expected i32 but got f32.
+  error: @0x00000026: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:279: assert_invalid passed:
+  error: type mismatch in f32.store, expected i32 but got f32.
+  error: @0x00000029: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:280: assert_invalid passed:
+  error: type mismatch in f64.store, expected i32 but got f32.
+  error: @0x0000002d: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:283: assert_invalid passed:
+  error: type mismatch in i32.store, expected i32 but got f32.
+  error: @0x00000026: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:284: assert_invalid passed:
+  error: type mismatch in i32.store8, expected i32 but got f32.
+  error: @0x00000026: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:285: assert_invalid passed:
+  error: type mismatch in i32.store16, expected i32 but got f32.
+  error: @0x00000026: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:286: assert_invalid passed:
+  error: type mismatch in i64.store, expected i64 but got f32.
+  error: @0x00000026: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:287: assert_invalid passed:
+  error: type mismatch in i64.store8, expected i64 but got f64.
+  error: @0x0000002a: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:288: assert_invalid passed:
+  error: type mismatch in i64.store16, expected i64 but got f64.
+  error: @0x0000002a: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:289: assert_invalid passed:
+  error: type mismatch in i64.store32, expected i64 but got f64.
+  error: @0x0000002a: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:290: assert_invalid passed:
+  error: type mismatch in f32.store, expected f32 but got i32.
+  error: @0x00000023: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:291: assert_invalid passed:
+  error: type mismatch in f64.store, expected f64 but got i64.
+  error: @0x00000023: on_store_expr callback failed
+out/third_party/testsuite/typecheck.wast:294: assert_invalid passed:
+  error: type mismatch in i32.add, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:295: assert_invalid passed:
+  error: type mismatch in i32.and, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:296: assert_invalid passed:
+  error: type mismatch in i32.div_s, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:297: assert_invalid passed:
+  error: type mismatch in i32.div_u, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:298: assert_invalid passed:
+  error: type mismatch in i32.mul, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:299: assert_invalid passed:
+  error: type mismatch in i32.or, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:300: assert_invalid passed:
+  error: type mismatch in i32.rem_s, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:301: assert_invalid passed:
+  error: type mismatch in i32.rem_u, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:302: assert_invalid passed:
+  error: type mismatch in i32.rotl, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:303: assert_invalid passed:
+  error: type mismatch in i32.rotr, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:304: assert_invalid passed:
+  error: type mismatch in i32.shl, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:305: assert_invalid passed:
+  error: type mismatch in i32.shr_s, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:306: assert_invalid passed:
+  error: type mismatch in i32.shr_u, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:307: assert_invalid passed:
+  error: type mismatch in i32.sub, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:308: assert_invalid passed:
+  error: type mismatch in i32.xor, expected i32 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:309: assert_invalid passed:
+  error: type mismatch in i64.add, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:310: assert_invalid passed:
+  error: type mismatch in i64.and, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:311: assert_invalid passed:
+  error: type mismatch in i64.div_s, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:312: assert_invalid passed:
+  error: type mismatch in i64.div_u, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:313: assert_invalid passed:
+  error: type mismatch in i64.mul, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:314: assert_invalid passed:
+  error: type mismatch in i64.or, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:315: assert_invalid passed:
+  error: type mismatch in i64.rem_s, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:316: assert_invalid passed:
+  error: type mismatch in i64.rem_u, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:317: assert_invalid passed:
+  error: type mismatch in i64.rotl, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:318: assert_invalid passed:
+  error: type mismatch in i64.rotr, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:319: assert_invalid passed:
+  error: type mismatch in i64.shl, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:320: assert_invalid passed:
+  error: type mismatch in i64.shr_s, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:321: assert_invalid passed:
+  error: type mismatch in i64.shr_u, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:322: assert_invalid passed:
+  error: type mismatch in i64.sub, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:323: assert_invalid passed:
+  error: type mismatch in i64.xor, expected i64 but got i32.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:324: assert_invalid passed:
+  error: type mismatch in f32.add, expected f32 but got i64.
+  error: @0x00000023: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:325: assert_invalid passed:
+  error: type mismatch in f32.copysign, expected f32 but got i64.
+  error: @0x00000023: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:326: assert_invalid passed:
+  error: type mismatch in f32.div, expected f32 but got i64.
+  error: @0x00000023: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:327: assert_invalid passed:
+  error: type mismatch in f32.max, expected f32 but got i64.
+  error: @0x00000023: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:328: assert_invalid passed:
+  error: type mismatch in f32.min, expected f32 but got i64.
+  error: @0x00000023: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:329: assert_invalid passed:
+  error: type mismatch in f32.mul, expected f32 but got i64.
+  error: @0x00000023: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:330: assert_invalid passed:
+  error: type mismatch in f32.sub, expected f32 but got i64.
+  error: @0x00000023: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:331: assert_invalid passed:
+  error: type mismatch in f64.add, expected f64 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:332: assert_invalid passed:
+  error: type mismatch in f64.copysign, expected f64 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:333: assert_invalid passed:
+  error: type mismatch in f64.div, expected f64 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:334: assert_invalid passed:
+  error: type mismatch in f64.max, expected f64 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:335: assert_invalid passed:
+  error: type mismatch in f64.min, expected f64 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:336: assert_invalid passed:
+  error: type mismatch in f64.mul, expected f64 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:337: assert_invalid passed:
+  error: type mismatch in f64.sub, expected f64 but got i64.
+  error: @0x0000001f: on_binary_expr callback failed
+out/third_party/testsuite/typecheck.wast:340: assert_invalid passed:
+  error: type mismatch in i32.eqz, expected i32 but got i64.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:341: assert_invalid passed:
+  error: type mismatch in i32.clz, expected i32 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:342: assert_invalid passed:
+  error: type mismatch in i32.ctz, expected i32 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:343: assert_invalid passed:
+  error: type mismatch in i32.popcnt, expected i32 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:344: assert_invalid passed:
+  error: type mismatch in i64.eqz, expected i64 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:345: assert_invalid passed:
+  error: type mismatch in i64.clz, expected i64 but got i32.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:346: assert_invalid passed:
+  error: type mismatch in i64.ctz, expected i64 but got i32.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:347: assert_invalid passed:
+  error: type mismatch in i64.popcnt, expected i64 but got i32.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:348: assert_invalid passed:
+  error: type mismatch in f32.abs, expected f32 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:349: assert_invalid passed:
+  error: type mismatch in f32.ceil, expected f32 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:350: assert_invalid passed:
+  error: type mismatch in f32.floor, expected f32 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:351: assert_invalid passed:
+  error: type mismatch in f32.nearest, expected f32 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:352: assert_invalid passed:
+  error: type mismatch in f32.neg, expected f32 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:353: assert_invalid passed:
+  error: type mismatch in f32.sqrt, expected f32 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:354: assert_invalid passed:
+  error: type mismatch in f32.trunc, expected f32 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:355: assert_invalid passed:
+  error: type mismatch in f64.abs, expected f64 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:356: assert_invalid passed:
+  error: type mismatch in f64.ceil, expected f64 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:357: assert_invalid passed:
+  error: type mismatch in f64.floor, expected f64 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:358: assert_invalid passed:
+  error: type mismatch in f64.nearest, expected f64 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:359: assert_invalid passed:
+  error: type mismatch in f64.neg, expected f64 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:360: assert_invalid passed:
+  error: type mismatch in f64.sqrt, expected f64 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:361: assert_invalid passed:
+  error: type mismatch in f64.trunc, expected f64 but got i64.
+  error: @0x0000001a: on_unary_expr callback failed
+out/third_party/testsuite/typecheck.wast:364: assert_invalid passed:
+  error: type mismatch in i32.eq, expected i32 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:365: assert_invalid passed:
+  error: type mismatch in i32.ge_s, expected i32 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:366: assert_invalid passed:
+  error: type mismatch in i32.ge_u, expected i32 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:367: assert_invalid passed:
+  error: type mismatch in i32.gt_s, expected i32 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:368: assert_invalid passed:
+  error: type mismatch in i32.gt_u, expected i32 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:369: assert_invalid passed:
+  error: type mismatch in i32.le_s, expected i32 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:370: assert_invalid passed:
+  error: type mismatch in i32.le_u, expected i32 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:371: assert_invalid passed:
+  error: type mismatch in i32.lt_s, expected i32 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:372: assert_invalid passed:
+  error: type mismatch in i32.lt_u, expected i32 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:373: assert_invalid passed:
+  error: type mismatch in i32.ne, expected i32 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:374: assert_invalid passed:
+  error: type mismatch in i64.eq, expected i64 but got i32.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:375: assert_invalid passed:
+  error: type mismatch in i64.ge_s, expected i64 but got i32.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:376: assert_invalid passed:
+  error: type mismatch in i64.ge_u, expected i64 but got i32.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:377: assert_invalid passed:
+  error: type mismatch in i64.gt_s, expected i64 but got i32.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:378: assert_invalid passed:
+  error: type mismatch in i64.gt_u, expected i64 but got i32.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:379: assert_invalid passed:
+  error: type mismatch in i64.le_s, expected i64 but got i32.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:380: assert_invalid passed:
+  error: type mismatch in i64.le_u, expected i64 but got i32.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:381: assert_invalid passed:
+  error: type mismatch in i64.lt_s, expected i64 but got i32.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:382: assert_invalid passed:
+  error: type mismatch in i64.lt_u, expected i64 but got i32.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:383: assert_invalid passed:
+  error: type mismatch in i64.ne, expected i64 but got i32.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:384: assert_invalid passed:
+  error: type mismatch in f32.eq, expected f32 but got i64.
+  error: @0x00000023: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:385: assert_invalid passed:
+  error: type mismatch in f32.ge, expected f32 but got i64.
+  error: @0x00000023: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:386: assert_invalid passed:
+  error: type mismatch in f32.gt, expected f32 but got i64.
+  error: @0x00000023: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:387: assert_invalid passed:
+  error: type mismatch in f32.le, expected f32 but got i64.
+  error: @0x00000023: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:388: assert_invalid passed:
+  error: type mismatch in f32.lt, expected f32 but got i64.
+  error: @0x00000023: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:389: assert_invalid passed:
+  error: type mismatch in f32.ne, expected f32 but got i64.
+  error: @0x00000023: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:390: assert_invalid passed:
+  error: type mismatch in f64.eq, expected f64 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:391: assert_invalid passed:
+  error: type mismatch in f64.ge, expected f64 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:392: assert_invalid passed:
+  error: type mismatch in f64.gt, expected f64 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:393: assert_invalid passed:
+  error: type mismatch in f64.le, expected f64 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:394: assert_invalid passed:
+  error: type mismatch in f64.lt, expected f64 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:395: assert_invalid passed:
+  error: type mismatch in f64.ne, expected f64 but got i64.
+  error: @0x0000001f: on_compare_expr callback failed
+out/third_party/testsuite/typecheck.wast:398: assert_invalid passed:
+  error: type mismatch in i32.wrap/i64, expected i64 but got f32.
+  error: @0x0000001d: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:399: assert_invalid passed:
+  error: type mismatch in i32.trunc_s/f32, expected f32 but got i64.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:400: assert_invalid passed:
+  error: type mismatch in i32.trunc_u/f32, expected f32 but got i64.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:401: assert_invalid passed:
+  error: type mismatch in i32.trunc_s/f64, expected f64 but got i64.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:402: assert_invalid passed:
+  error: type mismatch in i32.trunc_u/f64, expected f64 but got i64.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:403: assert_invalid passed:
+  error: type mismatch in i32.reinterpret/f32, expected f32 but got i64.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:404: assert_invalid passed:
+  error: type mismatch in i64.extend_s/i32, expected i32 but got f32.
+  error: @0x0000001d: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:405: assert_invalid passed:
+  error: type mismatch in i64.extend_u/i32, expected i32 but got f32.
+  error: @0x0000001d: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:406: assert_invalid passed:
+  error: type mismatch in i64.trunc_s/f32, expected f32 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:407: assert_invalid passed:
+  error: type mismatch in i64.trunc_u/f32, expected f32 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:408: assert_invalid passed:
+  error: type mismatch in i64.trunc_s/f64, expected f64 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:409: assert_invalid passed:
+  error: type mismatch in i64.trunc_u/f64, expected f64 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:410: assert_invalid passed:
+  error: type mismatch in i64.reinterpret/f64, expected f64 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:411: assert_invalid passed:
+  error: type mismatch in f32.convert_s/i32, expected i32 but got i64.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:412: assert_invalid passed:
+  error: type mismatch in f32.convert_u/i32, expected i32 but got i64.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:413: assert_invalid passed:
+  error: type mismatch in f32.convert_s/i64, expected i64 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:414: assert_invalid passed:
+  error: type mismatch in f32.convert_u/i64, expected i64 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:415: assert_invalid passed:
+  error: type mismatch in f32.demote/f64, expected f64 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:416: assert_invalid passed:
+  error: type mismatch in f32.reinterpret/i32, expected i32 but got i64.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:417: assert_invalid passed:
+  error: type mismatch in f64.convert_s/i32, expected i32 but got i64.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:418: assert_invalid passed:
+  error: type mismatch in f64.convert_u/i32, expected i32 but got i64.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:419: assert_invalid passed:
+  error: type mismatch in f64.convert_s/i64, expected i64 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:420: assert_invalid passed:
+  error: type mismatch in f64.convert_u/i64, expected i64 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:421: assert_invalid passed:
+  error: type mismatch in f64.promote/f32, expected f32 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:422: assert_invalid passed:
+  error: type mismatch in f64.reinterpret/i64, expected i64 but got i32.
+  error: @0x0000001a: on_convert_expr callback failed
+out/third_party/testsuite/typecheck.wast:425: assert_invalid passed:
+  error: type mismatch in grow_memory, expected i32 but got f32.
+  error: @0x00000023: on_grow_memory_expr callback failed
+193/193 tests passed.
 ;;; STDOUT ;;)