Skip to content

Commit fa6dfec

Browse files
committed
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 <[email protected]> Commit-Queue: Yang Guo <[email protected]> Reviewed-by: Yang Guo <[email protected]> Cr-Commit-Position: refs/heads/master@{#61789} Refs: v8/v8@f89e555 Backport-PR-URL: #28005 PR-URL: #27375 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent 8b8fe87 commit fa6dfec

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.5',
41+
'v8_embedder_string': '-node.6',
4242

4343
##### V8 defaults for Node.js #####
4444

deps/v8/src/api.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8940,7 +8940,8 @@ std::unique_ptr<MicrotaskQueue> MicrotaskQueue::New(Isolate* isolate,
89408940
auto microtask_queue =
89418941
i::MicrotaskQueue::New(reinterpret_cast<i::Isolate*>(isolate));
89428942
microtask_queue->set_microtasks_policy(policy);
8943-
return microtask_queue;
8943+
std::unique_ptr<MicrotaskQueue> ret(std::move(microtask_queue));
8944+
return ret;
89448945
}
89458946

89468947
MicrotasksScope::MicrotasksScope(Isolate* isolate, MicrotasksScope::Type type)

0 commit comments

Comments
 (0)