Commit 169406b
src: add missing context scopes
Add scopes that ensure that the context associated with the
current Environment is always entered when working with it.
PR-URL: #36413
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent 023291b commit 169406b
2 files changed
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -547,6 +547,8 @@ void Environment::InitializeLibuv() { | |||
| 547 | 547 | [](uv_async_t* async) { | |
| 548 | 548 | Environment* env = ContainerOf( | |
| 549 | 549 | &Environment::task_queues_async_, async); | |
| 550 | + HandleScope handle_scope(env->isolate()); | ||
| 551 | + Context::Scope context_scope(env->context()); | ||
| 550 | 552 | env->RunAndClearNativeImmediates(); | |
| 551 | 553 | }); | |
| 552 | 554 | uv_unref(reinterpret_cast<uv_handle_t*>(&task_queues_async_)); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -288,6 +288,7 @@ inline void FileHandle::Close() { | |||
| 288 | 288 | void FileHandle::CloseReq::Resolve() { | |
| 289 | 289 | Isolate* isolate = env()->isolate(); | |
| 290 | 290 | HandleScope scope(isolate); | |
| 291 | + Context::Scope context_scope(env()->context()); | ||
| 291 | 292 | InternalCallbackScope callback_scope(this); | |
| 292 | 293 | Local<Promise> promise = promise_.Get(isolate); | |
| 293 | 294 | Local<Promise::Resolver> resolver = promise.As<Promise::Resolver>(); | |
@@ -297,6 +298,7 @@ void FileHandle::CloseReq::Resolve() { | |||
| 297 | 298 | void FileHandle::CloseReq::Reject(Local<Value> reason) { | |
| 298 | 299 | Isolate* isolate = env()->isolate(); | |
| 299 | 300 | HandleScope scope(isolate); | |
| 301 | + Context::Scope context_scope(env()->context()); | ||
| 300 | 302 | InternalCallbackScope callback_scope(this); | |
| 301 | 303 | Local<Promise> promise = promise_.Get(isolate); | |
| 302 | 304 | Local<Promise::Resolver> resolver = promise.As<Promise::Resolver>(); | |
0 commit comments