nodejs
diff --git a/‎src/async-wrap.cc‎
Lines changed: 4 additions & 3 deletions b/‎src/async-wrap.cc‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎src/env.cc‎
Lines changed: 0 additions & 23 deletions b/‎src/env.cc‎
Lines changed: 0 additions & 23 deletions
diff --git a/‎src/env.h‎
Lines changed: 0 additions & 2 deletions b/‎src/env.h‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎src/node.cc‎
Lines changed: 17 additions & 1 deletion b/‎src/node.cc‎
Lines changed: 17 additions & 1 deletion
diff --git a/‎src/node_http_parser.cc‎
Lines changed: 0 additions & 4 deletions b/‎src/node_http_parser.cc‎
Lines changed: 0 additions & 4 deletions
@@ -181,7 +181,6 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
   Local<Function> post_fn = env()->async_hooks_post_function();
   Local<Value> uid = Integer::New(env()->isolate(), get_uid());
   Local<Object> context = object();
-  Local<Object> process = env()->process_object();
   Local<Object> domain;
   bool has_domain = false;
 
@@ -233,16 +232,18 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
     }
   }
 
-  Environment::TickInfo* tick_info = env()->tick_info();
-
   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);
     return ret;
 
@@ -64,27 +64,4 @@ 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
@@ -467,8 +467,6 @@ 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);
 
 
@@ -1204,7 +1204,23 @@ Local<Value> MakeCallback(Environment* env,
     }
   }
 
-  if (!env->KickNextTick(&callback_scope)) {
+  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()) {
     return Undefined(env->isolate());
   }
 
 
@@ -587,8 +587,6 @@ class Parser : public AsyncWrap {
     if (!cb->IsFunction())
       return;
 
-    Environment::AsyncCallbackScope callback_scope(parser->env());
-
     // Hooks for GetCurrentBuffer
     parser->current_buffer_len_ = nread;
     parser->current_buffer_data_ = buf->base;
@@ -597,8 +595,6 @@ class Parser : public AsyncWrap {
 
     parser->current_buffer_len_ = 0;
     parser->current_buffer_data_ = nullptr;
-
-    parser->env()->KickNextTick(&callback_scope);
   }
Original file line number	Diff line number	Diff line change
@@ -181,7 +181,6 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
181	181	Local<Function> post_fn = env()->async_hooks_post_function();
182	182	Local<Value> uid = Integer::New(env()->isolate(), get_uid());
183	183	Local<Object> context = object();
184		- Local<Object> process = env()->process_object();
185	184	Local<Object> domain;
186	185	bool has_domain = false;
187	186
@@ -233,16 +232,18 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
233	232	}
234	233	}
235	234
236		- Environment::TickInfo* tick_info = env()->tick_info();
237		-
238	235	if (callback_scope.in_makecallback()) {
239	236	return ret;
240	237	}
241	238
	239	+ Environment::TickInfo* tick_info = env()->tick_info();
	240	+
242	241	if (tick_info->length() == 0) {
243	242	env()->isolate()->RunMicrotasks();
244	243	}
245	244
	245	+ Local<Object> process = env()->process_object();
	246	+
246	247	if (tick_info->length() == 0) {
247	248	tick_info->set_index(0);
248	249	return ret;