src: check microtasks before running them

PR-URL: #29434 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: David Carlier <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Minwoo Jung <[email protected]>
nodejs · Sep 6, 2019 · 63b056d · 63b056d
1 parent 72650bc
commit 63b056d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/api/callback.cc b/src/api/callback.cc
@@ -12,6 +12,7 @@ using v8::HandleScope;
 using v8::Isolate;
 using v8::Local;
 using v8::MaybeLocal;
+using v8::MicrotasksScope;
 using v8::NewStringType;
 using v8::Object;
 using v8::String;
@@ -100,7 +101,7 @@ void InternalCallbackScope::Close() {
 
   if (!env_->can_call_into_js()) return;
   if (!tick_info->has_tick_scheduled()) {
-    env_->isolate()->RunMicrotasks();
+    MicrotasksScope::PerformCheckpoint(env_->isolate());
   }
 
   // Make sure the stack unwound properly. If there are nested MakeCallback's

diff --git a/src/node_task_queue.cc b/src/node_task_queue.cc
@@ -21,6 +21,7 @@ using v8::kPromiseRejectWithNoHandler;
 using v8::kPromiseResolveAfterResolved;
 using v8::Local;
 using v8::Message;
+using v8::MicrotasksScope;
 using v8::Number;
 using v8::Object;
 using v8::Promise;
@@ -43,7 +44,7 @@ static void EnqueueMicrotask(const FunctionCallbackInfo<Value>& args) {
 bool RunNextTicksNative(Environment* env) {
   TickInfo* tick_info = env->tick_info();
   if (!tick_info->has_tick_scheduled() && !tick_info->has_rejection_to_warn())
-    env->isolate()->RunMicrotasks();
+    MicrotasksScope::PerformCheckpoint(env->isolate());
   if (!tick_info->has_tick_scheduled() && !tick_info->has_rejection_to_warn())
     return true;