From 9f5bddc3376f24ca28b2fa50a9f9622410aa7d07 Mon Sep 17 00:00:00 2001 From: Victor Gomes Date: Wed, 19 Aug 2026 14:06:55 +0200 Subject: [PATCH 1/2] deps: V8: backport 7d5eb1df2a72 Backport the Maglev HeapNumber materialization fix to V8 13.6. Emit a captured HeapNumber with its map and constant numeric value, using the existing deoptimizer to allocate a fresh box. Reserve a nonduplicatable object ID for each box. Keep the literal-number helper for fixed double arrays and captured-object numeric values. No virtual object slot traversal changes or prerequisite commits are needed. This mirrors the existing V8 13.6 Turbolev map/value materialization. Original commit message: [maglev] Materialize a fresh HeapNumber per deoptimization This matches what Turbolev graph builder already does to Maglev. Fixed: 547819997 Change-Id: Iafc1185ef96db8816db36b295a3a4b7e528f9863 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/8255554 Reviewed-by: Leszek Swirski Commit-Queue: Victor Gomes Cr-Commit-Position: refs/heads/main@{#109347} Refs: https://github.com/v8/v8/commit/7d5eb1df2a721c8fe3aa03b999464c4b86242080 Refs: https://github.com/nodejs/node/issues/66457 Refs: https://www.cve.org/CVERecord?id=CVE-2026-85045 Co-authored-by: inoway46 Reviewed-by: Antoine du Hamel PR-URL: https://github.com/nodejs/node/pull/66567 --- common.gypi | 2 +- deps/v8/src/maglev/maglev-code-generator.cc | 20 +++++++--- .../test/mjsunit/maglev/regress-547819997.js | 38 +++++++++++++++++++ 3 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 deps/v8/test/mjsunit/maglev/regress-547819997.js diff --git a/common.gypi b/common.gypi index 14fa9dc23802..b772d9292fff 100644 --- a/common.gypi +++ b/common.gypi @@ -43,7 +43,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.65', + 'v8_embedder_string': '-node.66', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/maglev/maglev-code-generator.cc b/deps/v8/src/maglev/maglev-code-generator.cc index d6c7ded9745d..400e51898273 100644 --- a/deps/v8/src/maglev/maglev-code-generator.cc +++ b/deps/v8/src/maglev/maglev-code-generator.cc @@ -1466,6 +1466,11 @@ class MaglevFrameTranslationBuilder { return kNotDuplicated; } + int CreateUnduplicatableId() { + object_ids_.push_back(kNotDuplicated); + return kNotDuplicated; + } + void BuildHeapNumber(Float64 number) { DirectHandle value = local_isolate_->factory()->NewHeapNumberFromBits( @@ -1535,11 +1540,16 @@ class MaglevFrameTranslationBuilder { void BuildVirtualObject(const VirtualObject* object, const InputLocation*& input_location, const VirtualObjectList& virtual_objects) { - if (object->type() == VirtualObject::kHeapNumber) { - return BuildHeapNumber(object->number()); - } + DCHECK_NOT_NULL(object->allocation()); + // HeapNumbers may be mutable object fields; each materialization must + // create a fresh box, so they are never deduplicated. + // TODO(victorgomes): Constrain which objects may contain mutable + // HeapNumbers. Immutable HeapNumbers can be stored as a literal object + // instead of a captured object. int dup_id = - GetDuplicatedId(reinterpret_cast(object->allocation())); + object->type() == VirtualObject::kHeapNumber + ? CreateUnduplicatableId() + : GetDuplicatedId(reinterpret_cast(object->allocation())); if (dup_id != kNotDuplicated) { translation_array_builder_->DuplicateObject(dup_id); object->ForEachNestedRuntimeInput(virtual_objects, @@ -1699,7 +1709,7 @@ class MaglevFrameTranslationBuilder { IdentityMap* protected_deopt_literals_; IdentityMap* deopt_literals_; - static const int kNotDuplicated = -1; + static constexpr int kNotDuplicated = -1; std::vector object_ids_; }; diff --git a/deps/v8/test/mjsunit/maglev/regress-547819997.js b/deps/v8/test/mjsunit/maglev/regress-547819997.js new file mode 100644 index 000000000000..43a8e395d3fc --- /dev/null +++ b/deps/v8/test/mjsunit/maglev/regress-547819997.js @@ -0,0 +1,38 @@ +// Copyright 2026 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Flags: --allow-natives-syntax --maglev + +const boxes = []; + +// Never called during warm-up, so this call site has no feedback and Maglev +// emits an unconditional deopt for it. The literal below is therefore only +// used by deopt frames and gets elided by escape analysis. +function sink(o) { + boxes.push(o); +} + +function foo(depth, take) { + const o = {x: 1.5}; + if (depth > 0) foo(depth - 1, take); + if (take) sink(o); +} + +%PrepareFunctionForOptimization(foo); +foo(3, false); +foo(3, false); +%OptimizeMaglevOnNextCall(foo); +foo(3, false); + +// Deopts the innermost activation eagerly and the outer ones lazily, so every +// activation materializes its own object. +foo(3, true); + +assertEquals(4, boxes.length); +for (let i = 0; i < boxes.length; i++) { + boxes[i].x = i; +} +for (let i = 0; i < boxes.length; i++) { + assertEquals(i, boxes[i].x); +} From e2b8a0c05d0fdc1fc8c8eb66a3aae8149f5937dd Mon Sep 17 00:00:00 2001 From: inoway46 Date: Fri, 20 Nov 2026 11:58:08 +0900 Subject: [PATCH 2/2] deps: restore V8 HeapNumber materialization The v24 backport leaves virtual HeapNumbers reaching UNREACHABLE() while building Maglev deoptimization frames. Restore the map and value serialization from aff9d2f38b6 so the existing deoptimizer materializes a fresh HeapNumber for each box. Refs: https://github.com/nodejs/node/pull/66567#issuecomment-7027917521 Assisted-by: Codex Signed-off-by: inoway46 --- common.gypi | 2 +- deps/v8/src/maglev/maglev-code-generator.cc | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common.gypi b/common.gypi index b772d9292fff..96adf3849bb3 100644 --- a/common.gypi +++ b/common.gypi @@ -43,7 +43,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.66', + 'v8_embedder_string': '-node.67', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/maglev/maglev-code-generator.cc b/deps/v8/src/maglev/maglev-code-generator.cc index 400e51898273..dca46d93238b 100644 --- a/deps/v8/src/maglev/maglev-code-generator.cc +++ b/deps/v8/src/maglev/maglev-code-generator.cc @@ -1558,8 +1558,11 @@ class MaglevFrameTranslationBuilder { } switch (object->type()) { case VirtualObject::kHeapNumber: - // Handled above. - UNREACHABLE(); + translation_array_builder_->BeginCapturedObject(2); + translation_array_builder_->StoreLiteral( + GetDeoptLiteral(*object->map().object())); + BuildHeapNumber(object->number()); + return; case VirtualObject::kConsString: return BuildConsString(object, input_location, virtual_objects); case VirtualObject::kFixedDoubleArray: