0
0
mirror of https://github.com/nodejs/node.git synced 2024-12-01 16:10:02 +01:00

deps: V8: backport f89e555

Original commit message:

    [api] Fix compilation issue with macOS

    Fixes the following error caught by the Node.js CI:

    ../deps/v8/src/api.cc:8943:10:
      error: no viable conversion from returned value of type
      'unique_ptr<v8::internal::MicrotaskQueue, default_delete<v8::internal::MicrotaskQueue>>'
      to function return type
      'unique_ptr<v8::MicrotaskQueue, default_delete<v8::MicrotaskQueue>>'

      return microtask_queue;
             ^~~~~~~~~~~~~~~

    Change-Id: Ic09dab46bb8f87a2b3b59f5836e0883bfe0e9681
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1627533
    Commit-Queue: Michaël Zasso <mic.besace@gmail.com>
    Commit-Queue: Yang Guo <yangguo@chromium.org>
    Reviewed-by: Yang Guo <yangguo@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#61789}

Refs: f89e555956

PR-URL: https://github.com/nodejs/node/pull/27375
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Michaël Zasso 2019-05-23 16:07:20 +02:00 committed by Refael Ackermann
parent cdd4439672
commit 4badd3eeb2
2 changed files with 3 additions and 2 deletions

View File

@ -38,7 +38,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.5',
'v8_embedder_string': '-node.6',
##### V8 defaults for Node.js #####

3
deps/v8/src/api.cc vendored
View File

@ -8940,7 +8940,8 @@ std::unique_ptr<MicrotaskQueue> MicrotaskQueue::New(Isolate* isolate,
auto microtask_queue =
i::MicrotaskQueue::New(reinterpret_cast<i::Isolate*>(isolate));
microtask_queue->set_microtasks_policy(policy);
return microtask_queue;
std::unique_ptr<MicrotaskQueue> ret(std::move(microtask_queue));
return ret;
}
MicrotasksScope::MicrotasksScope(Isolate* isolate, MicrotasksScope::Type type)