add KickNextTick back

revert f1488bb

Author: rogerwang

src/env.cc

@@ -64,4 +64,27 @@ void Environment::PrintSyncTrace() const {
   fflush(stderr);
 }
 
+
+bool Environment::KickNextTick(Environment::AsyncCallbackScope* scope) {
+  TickInfo* info = tick_info();
+
+  if (scope->in_makecallback()) {
+    return true;
+  }
+
+  if (info->length() == 0) {
+    isolate()->RunMicrotasks();
+  }
+
+  if (info->length() == 0) {
+    info->set_index(0);
+    return true;
+  }
+
+  Local<Value> ret =
+    tick_callback_function()->Call(process_object(), 0, nullptr);
+
+  return !ret.IsEmpty();
+}
+
 }  // namespace node

src/env.h

@@ -467,6 +467,8 @@ class Environment {
 
   inline int64_t get_async_wrap_uid();
 
+  bool KickNextTick(AsyncCallbackScope* scope);
+
   inline uint32_t* heap_statistics_buffer() const;
   inline void set_heap_statistics_buffer(uint32_t* pointer);
 

src/node.cc

@@ -1257,23 +1257,7 @@ Local<Value> MakeCallback(Environment* env,
     }
   }
 
-  if (callback_scope.in_makecallback()) {
-    return ret;
-  }
-
-  Environment::TickInfo* tick_info = env->tick_info();
-
-  if (tick_info->length() == 0) {
-    env->isolate()->RunMicrotasks();
-  }
-
-  Local<Object> process = env->process_object();
-
-  if (tick_info->length() == 0) {
-    tick_info->set_index(0);
-  }
-
-  if (env->tick_callback_function()->Call(process, 0, nullptr).IsEmpty()) {
+  if (!env->KickNextTick(&callback_scope)) {
     return Undefined(env->isolate());
   }