From 88ed027d573fd3a98c4e927166903d369f474df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sun, 25 Sep 2022 17:35:13 +0200 Subject: [PATCH] deps: V8: cherry-pick 7ddb8399f9f1 Original commit message: [msvc] fix ambiguous call to function in assembler test MSVC is confused by initializer list and default parameter, and reports an ambiguous call. test/cctest/test-assembler-arm64.cc(12208): error C2668: 'v8::internal::Clobber': ambiguous call to overloaded function test-utils-arm64.h(251): note: could be 'void v8::internal::Clobber(v8::internal::MacroAssembler *,v8::internal::CPURegList)' test-utils-arm64.h(241): note: or 'void v8::internal::Clobber(v8::internal::MacroAssembler *,v8::internal::RegList,const uint64_t)' Solution is to construct with explicit type. Bug: v8:13312 Change-Id: I66f5ba48bcdf6eb30035beaf7214a3d26fc9f18b Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3913034 Reviewed-by: Igor Sheludko Commit-Queue: Jakob Kummerow Reviewed-by: Jakob Kummerow Cr-Commit-Position: refs/heads/main@{#83406} Refs: https://github.com/v8/v8/commit/7ddb8399f9f1aa2d703bffa9cc26fa94a7b3a0ef PR-URL: https://github.com/nodejs/node/pull/44741 Reviewed-By: Ben Noordhuis Reviewed-By: Jiawen Geng Reviewed-By: James M Snell --- common.gypi | 2 +- deps/v8/test/cctest/test-assembler-arm64.cc | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common.gypi b/common.gypi index 05b742910325cd..e5d973abda9397 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.9', + 'v8_embedder_string': '-node.10', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/test/cctest/test-assembler-arm64.cc b/deps/v8/test/cctest/test-assembler-arm64.cc index ef88b2963c7c4e..59643beabe8489 100644 --- a/deps/v8/test/cctest/test-assembler-arm64.cc +++ b/deps/v8/test/cctest/test-assembler-arm64.cc @@ -12179,35 +12179,35 @@ TEST(peek_poke_unaligned) { // x0-x6 should be unchanged. // w10-w12 should contain the lower words of x0-x2. __ Poke(x0, 1); - Clobber(&masm, {x0}); + Clobber(&masm, RegList{x0}); __ Peek(x0, 1); __ Poke(x1, 2); - Clobber(&masm, {x1}); + Clobber(&masm, RegList{x1}); __ Peek(x1, 2); __ Poke(x2, 3); - Clobber(&masm, {x2}); + Clobber(&masm, RegList{x2}); __ Peek(x2, 3); __ Poke(x3, 4); - Clobber(&masm, {x3}); + Clobber(&masm, RegList{x3}); __ Peek(x3, 4); __ Poke(x4, 5); - Clobber(&masm, {x4}); + Clobber(&masm, RegList{x4}); __ Peek(x4, 5); __ Poke(x5, 6); - Clobber(&masm, {x5}); + Clobber(&masm, RegList{x5}); __ Peek(x5, 6); __ Poke(x6, 7); - Clobber(&masm, {x6}); + Clobber(&masm, RegList{x6}); __ Peek(x6, 7); __ Poke(w0, 1); - Clobber(&masm, {w10}); + Clobber(&masm, RegList{w10}); __ Peek(w10, 1); __ Poke(w1, 2); - Clobber(&masm, {w11}); + Clobber(&masm, RegList{w11}); __ Peek(w11, 2); __ Poke(w2, 3); - Clobber(&masm, {w12}); + Clobber(&masm, RegList{w12}); __ Peek(w12, 3); __ Drop(4);