Skip to content

Commit

Permalink
deps: V8: cherry-pick 7ddb8399f9f1
Browse files Browse the repository at this point in the history
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 <ishell@chromium.org>
    Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
    Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#83406}

Refs: v8/v8@7ddb839
PR-URL: #44741
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
targos committed Oct 11, 2022
1 parent 26c651c commit 88ed027
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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 #####

Expand Down
20 changes: 10 additions & 10 deletions deps/v8/test/cctest/test-assembler-arm64.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 88ed027

Please sign in to comment.