src: guard slightly costly check in MakeCallback more strongly

addaleax · danielleadams · commit 59625f70adbe · 2022-01-31T23:54:30.000-05:00
PR-URL: #41331 Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Darshan Sen <raisinten@gmail.com>
diff --git a/src/api/callback.cc b/src/api/callback.cc
@@ -64,10 +64,17 @@ InternalCallbackScope::InternalCallbackScope(Environment* env,
   Isolate* isolate = env->isolate();
 
   HandleScope handle_scope(isolate);
-  // If you hit this assertion, you forgot to enter the v8::Context first.
-  CHECK_EQ(Environment::GetCurrent(isolate), env);
+  Local<Context> current_context = isolate->GetCurrentContext();
+  // If you hit this assertion, the caller forgot to enter the right Node.js
+  // Environment's v8::Context first.
+  // We first check `env->context() != current_context` because the contexts
+  // likely *are* the same, in which case we can skip the slightly more
+  // expensive Environment::GetCurrent() call.
+  if (UNLIKELY(env->context() != current_context)) {
+    CHECK_EQ(Environment::GetCurrent(isolate), env);
+  }
 
-  env->isolate()->SetIdle(false);
+  isolate->SetIdle(false);
 
   env->async_hooks()->push_async_context(
     async_context_.async_id, async_context_.trigger_async_id, object);
