From 34ba631a0b0807f22ed021c244e46d995c78fd31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 11 Oct 2022 09:05:51 +0200 Subject: [PATCH] deps: V8: cherry-pick e7f0f26f5ef3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: Don't run sampling-heap-profiler-flags with stress-incremental-marking This test observes GC behavior and needs the garbage collector to work in a somewhat predictable way. Bug: v8:13286 Change-Id: I24e6a4f33a644b5f1845cd34558da03fc196f7e5 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3898721 Commit-Queue: Seth Brenith Reviewed-by: Simon Zünd Cr-Commit-Position: refs/heads/main@{#83218} Refs: https://github.com/v8/v8/commit/e7f0f26f5ef34db70e944218e72febb4fbe7eaa8 PR-URL: https://github.com/nodejs/node/pull/44958 Reviewed-By: Jiawen Geng Reviewed-By: Beth Griggs Reviewed-By: Rafael Gonzaga Reviewed-By: Richard Lau --- common.gypi | 2 +- .../inspector/heap-profiler/sampling-heap-profiler-flags.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index 0e5ce682494601..2a06e7d1401df0 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,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.13', + 'v8_embedder_string': '-node.14', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/test/inspector/heap-profiler/sampling-heap-profiler-flags.js b/deps/v8/test/inspector/heap-profiler/sampling-heap-profiler-flags.js index 7a1ffa9472b78b..89aa552b18712b 100644 --- a/deps/v8/test/inspector/heap-profiler/sampling-heap-profiler-flags.js +++ b/deps/v8/test/inspector/heap-profiler/sampling-heap-profiler-flags.js @@ -3,6 +3,7 @@ // found in the LICENSE file. // Flags: --sampling-heap-profiler-suppress-randomness +// Flags: --no-stress-incremental-marking (async function() { let {contextGroup, Protocol} = InspectorTest.start('Checks sampling heap profiler methods.');