Raise validation error on invalid constant expression

circle.yml

@@ -272,8 +272,8 @@ jobs:
       - benchmark:
           min_time: "0.01"
       - spectest:
-          expected_passed: 4859
-          expected_failed: 573
+          expected_passed: 4874
+          expected_failed: 558
           expected_skipped: 6381
 
   sanitizers-macos:
@@ -290,8 +290,8 @@ jobs:
       - benchmark:
           min_time: "0.01"
       - spectest:
-          expected_passed: 4859
-          expected_failed: 573
+          expected_passed: 4874
+          expected_failed: 558
           expected_skipped: 6381
 
   benchmark:
@@ -401,8 +401,8 @@ jobs:
           expected_failed: 8
           expected_skipped: 7323
       - spectest:
-          expected_passed: 4859
-          expected_failed: 573
+          expected_passed: 4874
+          expected_failed: 558
           expected_skipped: 6381
 
 workflows:

lib/fizzy/parser.cpp

@@ -114,8 +114,8 @@ inline parser_result<ConstantExpression> parse_constant_expression(
         switch (instr)
         {
         default:
-            throw parser_error{"unexpected instruction in the global initializer expression: " +
-                               std::to_string(*(pos - 1))};
+            throw validation_error{
+                "unexpected instruction in the constant expression: " + std::to_string(*(pos - 1))};
 
         case Instr::end:
             break;

test/unittests/parser_test.cpp

@@ -640,11 +640,12 @@ TEST(parser, global_invalid_mutability)
         "unexpected byte value 2, expected 0x00 or 0x01 for global mutability");
 }
 
-TEST(parser, global_initializer_expression_invalid_instruction)
+TEST(parser, global_invalid_initializer)
 {
-    const auto wasm = bytes{wasm_prefix} + make_section(6, make_vec({"7f0000"_bytes}));
-    EXPECT_THROW_MESSAGE(parse(wasm), parser_error,
-        "unexpected instruction in the global initializer expression: 0");
+    // valtype=i32 mutability=0 expression=<memory_size>
+    const auto wasm = bytes{wasm_prefix} + make_section(6, make_vec({"7f003f"_bytes}));
+    EXPECT_THROW_MESSAGE(
+        parse(wasm), validation_error, "unexpected instruction in the constant expression: 63");
 }
 
 TEST(parser, global_valtype_out_of_bounds)
@@ -873,6 +874,14 @@ TEST(parser, element_section_tableidx_nonzero)
     EXPECT_THROW_MESSAGE(parse(bin), parser_error, "unexpected tableidx value 1");
 }
 
+TEST(parser, element_section_invalid_initializer)
+{
+    // tableidx=0 expression=<memory_size> items=0
+    const auto wasm = bytes{wasm_prefix} + make_section(9, make_vec({"003f00"_bytes}));
+    EXPECT_THROW_MESSAGE(
+        parse(wasm), validation_error, "unexpected instruction in the constant expression: 63");
+}
+
 TEST(parser, element_section_no_table_section)
 {
     const auto wasm =
@@ -1246,6 +1255,14 @@ TEST(parser, data_section_memidx_nonzero)
     EXPECT_THROW_MESSAGE(parse(bin), parser_error, "unexpected memidx value 1");
 }
 
+TEST(parser, data_section_invalid_initializer)
+{
+    // memidx=0 expression=<memory_size> items=0
+    const auto wasm = bytes{wasm_prefix} + make_section(9, make_vec({"003f00"_bytes}));
+    EXPECT_THROW_MESSAGE(
+        parse(wasm), validation_error, "unexpected instruction in the constant expression: 63");
+}
+
 TEST(parser, data_section_empty_vector_without_memory)
 {
     const auto bin = bytes{wasm_prefix} + make_section(11, make_vec({"0041010b00"_bytes}));