src: guard slightly costly check in MakeCallback more strongly · nodejs/node@6187e81 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 759
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 6187e81

Browse filesBrowse the repository at this point in the historyBrowse files

addaleax

authored and

targos

committed

src: guard slightly costly check in MakeCallback more strongly

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>

1 parent bd8b95a commit 6187e81
Copy full SHA for 6187e81

1 file changed

+10-3Lines changed: 10 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/api
  • callback.cc

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/api/callback.cc‎

Copy file name to clipboardExpand all lines: src/api/callback.cc

+10-3Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -64,10 +64,17 @@ InternalCallbackScope::InternalCallbackScope(Environment* env,
64	64	Isolate* isolate = env->isolate();
65	65
66	66	HandleScope handle_scope(isolate);
67		- // If you hit this assertion, you forgot to enter the v8::Context first.
68		- CHECK_EQ(Environment::GetCurrent(isolate), env);
	67	+ Local<Context> current_context = isolate->GetCurrentContext();
	68	+ // If you hit this assertion, the caller forgot to enter the right Node.js
	69	+ // Environment's v8::Context first.
	70	+ // We first check `env->context() != current_context` because the contexts
	71	+ // likely *are* the same, in which case we can skip the slightly more
	72	+ // expensive Environment::GetCurrent() call.
	73	+ if (UNLIKELY(env->context() != current_context)) {
	74	+ CHECK_EQ(Environment::GetCurrent(isolate), env);
	75	+ }
69	76
70		- env->isolate()->SetIdle(false);
	77	+ isolate->SetIdle(false);
71	78
72	79	env->async_hooks()->push_async_context(
73	80	async_context_.async_id, async_context_.trigger_async_id, object);

0 commit comments

Comments

0 (0)