Skip to content

Commit 82e371c

Browse files
manoskoukguybedford
authored andcommitted
deps: V8: cherry-pick c734674e03f9
Original commit message: [wasm][exnref] Fix null value for constant expressions Bug: v8:14398 Change-Id: Ia00d2de97a897d608d6c043b6e267c7d6313a18b Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5402583 Auto-Submit: Manos Koukoutos <[email protected]> Commit-Queue: Thibaud Michaud <[email protected]> Reviewed-by: Thibaud Michaud <[email protected]> Cr-Commit-Position: refs/heads/main@{#93107} Refs: v8/v8@c734674
1 parent 00480c9 commit 82e371c

2 files changed

Lines changed: 3 additions & 2 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.41',
41+
'v8_embedder_string': '-node.42',
4242

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

deps/v8/src/wasm/constant-expression-interface.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ void ConstantExpressionInterface::RefNull(FullDecoder* decoder, ValueType type,
105105
Value* result) {
106106
if (!generate_value()) return;
107107
result->runtime_value =
108-
WasmValue(type == kWasmExternRef || type == kWasmNullExternRef
108+
WasmValue((IsSubtypeOf(type, kWasmExternRef, decoder->module_) ||
109+
IsSubtypeOf(type, kWasmExnRef, decoder->module_))
109110
? Handle<Object>::cast(isolate_->factory()->null_value())
110111
: Handle<Object>::cast(isolate_->factory()->wasm_null()),
111112
type);

0 commit comments

Comments
 (0)