[wasm][exnref] Accept non-nullable exn catch type

thibaudmichaud · V8 LUCI CQ · commit 7cb6188cf913 · 2024-10-16T18:03:17.000Z
R=jkummerow@chromium.org Fixed: 373681572 Change-Id: Iecfc86d2ce6592a6f442bc3504ddde58ff236f64 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5938956 Commit-Queue: Thibaud Michaud <thibaudm@chromium.org> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> Cr-Commit-Position: refs/heads/main@{#96637}
diff --git a/src/wasm/function-body-decoder-impl.h b/src/wasm/function-body-decoder-impl.h
@@ -3308,7 +3308,7 @@ class WasmFullDecoder : public WasmDecoder<ValidationTag, decoding_mode> {
       }
       if (catch_case.kind == kCatchRef || catch_case.kind == kCatchAllRef) {
         stack_.EnsureMoreCapacity(1, this->zone_);
-        Push(kWasmExnRef);
+        Push(ValueType::Ref(HeapType::kExn));
         push_count += 1;
       }
       Control* target = control_at(catch_case.br_imm.depth);
@@ -3534,7 +3534,7 @@ class WasmFullDecoder : public WasmDecoder<ValidationTag, decoding_mode> {
           }
           if (catch_case.kind == kCatchRef || catch_case.kind == kCatchAllRef) {
             stack_.EnsureMoreCapacity(1, this->zone_);
-            Push(kWasmExnRef);
+            Push(ValueType::Ref(HeapType::kExn));
             push_count += 1;
           }
           base::Vector<Value> values(
diff --git a/src/wasm/graph-builder-interface.cc b/src/wasm/graph-builder-interface.cc
@@ -1406,7 +1406,7 @@ class WasmGraphBuildingInterface {
 
     if (catch_case.kind == kCatchAll || catch_case.kind == kCatchAllRef) {
       if (catch_case.kind == kCatchAllRef) {
-        DCHECK_EQ(values[0].type, kWasmExnRef);
+        DCHECK_EQ(values[0].type, ValueType::Ref(HeapType::kExn));
         values[0].node = block->try_info->exception;
       }
       BrOrRet(decoder, catch_case.br_imm.depth);
@@ -1473,7 +1473,7 @@ class WasmGraphBuildingInterface {
     }
 
     if (catch_case.kind == kCatchRef) {
-      DCHECK_EQ(values.last().type, kWasmExnRef);
+      DCHECK_EQ(values.last().type, ValueType::Ref(HeapType::kExn));
       values.last().node = block->try_info->exception;
     }
     BrOrRet(decoder, catch_case.br_imm.depth);
diff --git a/test/unittests/wasm/function-body-decoder-unittest.cc b/test/unittests/wasm/function-body-decoder-unittest.cc
@@ -2997,20 +2997,29 @@ TEST_F(FunctionBodyDecoderTest, TryTable) {
        U32V_1(1), CatchKind::kCatchAllRef, U32V_1(0), kExprEnd,
        kExprUnreachable, kExprEnd, kExprDrop},
       kAppendEnd);
-  // // Duplicate catch-all.
+  // Duplicate catch-all.
   ExpectValidates(
       sigs.v_v(),
       {kExprBlock, kExnRefCode, WASM_TRY_TABLE_OP, U32V_1(4),
        CatchKind::kCatchAll, U32V_1(1), CatchKind::kCatchAll, U32V_1(1),
        CatchKind::kCatchAllRef, U32V_1(0), CatchKind::kCatchAllRef, U32V_1(0),
        kExprEnd, kExprUnreachable, kExprEnd, kExprDrop},
       kAppendEnd);
-  // // Catch-all before catch.
+  // Catch-all before catch.
   ExpectValidates(
       sigs.v_v(),
       {WASM_TRY_TABLE_OP, U32V_1(2), CatchKind::kCatchAll, U32V_1(0),
        CatchKind::kCatch, ex, U32V_1(0), kExprEnd, kExprUnreachable},
       kAppendEnd);
+  // Non-nullable exnref.
+  ValueType kNonNullableExnRef = ValueType::Ref(HeapType::kExn);
+  auto sig = FixedSizeSignature<ValueType>::Returns(kNonNullableExnRef);
+  uint8_t sig_id = builder.AddSignature(&sig);
+  ExpectValidates(
+      sigs.v_v(),
+      {kExprBlock, sig_id, WASM_TRY_TABLE_OP, U32V_1(1), CatchKind::kCatchRef,
+       ex, U32V_1(0), kExprEnd, kExprUnreachable, kExprEnd, kExprDrop},
+      kAppendEnd);
 
   constexpr uint8_t kInvalidCatchKind = kLastCatchKind + 1;
   ExpectFailure(sigs.v_v(),

Original file line number	Diff line number	Diff line change
`@@ -3308,7 +3308,7 @@ class WasmFullDecoder : public WasmDecoder<ValidationTag, decoding_mode> {`
`3308`	`3308`	`}`
`3309`	`3309`	`if (catch_case.kind == kCatchRef \|\| catch_case.kind == kCatchAllRef) {`
`3310`	`3310`	`stack_.EnsureMoreCapacity(1, this->zone_);`
`3311`		`- Push(kWasmExnRef);`
	`3311`	`+ Push(ValueType::Ref(HeapType::kExn));`
`3312`	`3312`	`push_count += 1;`
`3313`	`3313`	`}`
`3314`	`3314`	`Control* target = control_at(catch_case.br_imm.depth);`
`@@ -3534,7 +3534,7 @@ class WasmFullDecoder : public WasmDecoder<ValidationTag, decoding_mode> {`
`3534`	`3534`	`}`
`3535`	`3535`	`if (catch_case.kind == kCatchRef \|\| catch_case.kind == kCatchAllRef) {`
`3536`	`3536`	`stack_.EnsureMoreCapacity(1, this->zone_);`
`3537`		`- Push(kWasmExnRef);`
	`3537`	`+ Push(ValueType::Ref(HeapType::kExn));`
`3538`	`3538`	`push_count += 1;`
`3539`	`3539`	`}`
`3540`	`3540`	`base::Vector<Value> values(`
Original file line number	Diff line number	Diff line change
`@@ -1406,7 +1406,7 @@ class WasmGraphBuildingInterface {`
`1406`	`1406`
`1407`	`1407`	`if (catch_case.kind == kCatchAll \|\| catch_case.kind == kCatchAllRef) {`
`1408`	`1408`	`if (catch_case.kind == kCatchAllRef) {`
`1409`		`- DCHECK_EQ(values[0].type, kWasmExnRef);`
	`1409`	`+ DCHECK_EQ(values[0].type, ValueType::Ref(HeapType::kExn));`
`1410`	`1410`	`values[0].node = block->try_info->exception;`
`1411`	`1411`	`}`
`1412`	`1412`	`BrOrRet(decoder, catch_case.br_imm.depth);`
`@@ -1473,7 +1473,7 @@ class WasmGraphBuildingInterface {`
`1473`	`1473`	`}`
`1474`	`1474`
`1475`	`1475`	`if (catch_case.kind == kCatchRef) {`
`1476`		`- DCHECK_EQ(values.last().type, kWasmExnRef);`
	`1476`	`+ DCHECK_EQ(values.last().type, ValueType::Ref(HeapType::kExn));`
`1477`	`1477`	`values.last().node = block->try_info->exception;`
`1478`	`1478`	`}`
`1479`	`1479`	`BrOrRet(decoder, catch_case.br_imm.depth);`