simplify

Author: gurgunday

src/env.cc

@@ -1411,15 +1411,16 @@ void Environment::RunAndClearInterrupts() {
   }
 }
 
+bool Environment::HasNativeImmediates() const {
+  return native_immediates_.size() > 0 ||
+         native_immediates_threadsafe_.size() > 0 ||
+         native_immediates_interrupts_.size() > 0;
+}
+
 void Environment::RunAndClearNativeImmediates(bool only_refed) {
   TRACE_EVENT0(TRACING_CATEGORY_NODE1(environment),
                "RunAndClearNativeImmediates");
-  // Skip the callback scope on the common empty path. These are the only
-  // queues drained by this function. If a threadsafe immediate is queued
-  // concurrently after this check, uv_async_send() schedules another drain.
-  if (native_immediates_.size() == 0 &&
-      native_immediates_threadsafe_.size() == 0 &&
-      native_immediates_interrupts_.size() == 0) {
+  if (!HasNativeImmediates()) {
     return;
   }
 
@@ -1595,6 +1596,9 @@ void Environment::CheckImmediate(uv_check_t* handle) {
   Environment* env = Environment::from_immediate_check_handle(handle);
   TRACE_EVENT0(TRACING_CATEGORY_NODE1(environment), "CheckImmediate");
 
+  if (env->immediate_info()->count() == 0 && !env->HasNativeImmediates())
+    return;
+
   HandleScope scope(env->isolate());
   Context::Scope context_scope(env->context());
 

src/env.h

@@ -1034,6 +1034,7 @@ class Environment final : public MemoryRetainer {
 
   void RunAndClearNativeImmediates(bool only_refed = false);
   void RunAndClearInterrupts();
+  bool HasNativeImmediates() const;
 
   uv_buf_t allocate_managed_buffer(const size_t suggested_size);
   std::unique_ptr<v8::BackingStore> release_managed_buffer(const uv_buf_t& buf);