Skip to content

Commit ff4b2c7

Browse files
thibaudmichaudguybedford
authored andcommitted
deps: V8: backport 1b27e4674f11
Original commit message: [wasm] Disallow v128 in exception handling JS API R=jkummerow@chromium.org Fixed: 395214627 Change-Id: Ief84b0fd79a87e539dfbfed31d475926f0f0a288 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6249317 Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> Commit-Queue: Thibaud Michaud <thibaudm@chromium.org> Cr-Commit-Position: refs/heads/main@{#98608} Refs: v8/v8@1b27e4674f11
1 parent 746b4c9 commit ff4b2c7

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.54',
41+
'v8_embedder_string': '-node.55',
4242

4343
##### V8 defaults for Node.js #####
4444

deps/v8/src/wasm/wasm-js.cc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,12 +1982,14 @@ void EncodeExceptionValues(v8::Isolate* isolate,
19821982
values_out->set(index++, *value_handle);
19831983
break;
19841984
}
1985+
case i::wasm::kS128:
1986+
thrower->TypeError("Invalid type v128");
1987+
return;
19851988
case i::wasm::kRtt:
19861989
case i::wasm::kI8:
19871990
case i::wasm::kI16:
19881991
case i::wasm::kVoid:
19891992
case i::wasm::kBottom:
1990-
case i::wasm::kS128:
19911993
UNREACHABLE();
19921994
}
19931995
}
@@ -2799,12 +2801,14 @@ void WebAssemblyExceptionGetArgImpl(
27992801
return WasmObjectToJSReturnValue(return_value, obj, signature->get(index),
28002802
i_isolate, &thrower);
28012803
}
2804+
case i::wasm::kS128:
2805+
thrower.TypeError("Invalid type v128");
2806+
return;
28022807
case i::wasm::kRtt:
28032808
case i::wasm::kI8:
28042809
case i::wasm::kI16:
28052810
case i::wasm::kVoid:
28062811
case i::wasm::kBottom:
2807-
case i::wasm::kS128:
28082812
UNREACHABLE();
28092813
}
28102814
info.GetReturnValue().Set(result);

0 commit comments

Comments
 (0)