Commit 234c26c
authored
src: store Local for CallbackScope on stack
This is a requirement of the V8 API, but requires a separate
semver-major change (as it is ABI-breaking) to address.
(There's also a similar requirement for `napi_open_callback_scope`
that would not be easily addressable without breaking ABI compatibility
there as well. In real-world situations, it seems extremely unlikely
that the `CallbackScope` would be the only reference to the resource
object.)
PR-URL: #59705
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>1 parent d58343e commit 234c26c
2 files changed
Lines changed: 6 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -26,10 +26,10 @@ CallbackScope::CallbackScope(Isolate* isolate, | |||
| 26 | 26 | CallbackScope::CallbackScope(Environment* env, | |
| 27 | 27 | Local<Object> object, | |
| 28 | 28 | async_context asyncContext) | |
| 29 | - : private_(new InternalCallbackScope(env, | ||
| 30 | - object, | ||
| 31 | - asyncContext)), | ||
| 32 | - try_catch_(env->isolate()) { | ||
| 29 | + : resource_storage_(object), | ||
| 30 | + private_( | ||
| 31 | + new InternalCallbackScope(env, &resource_storage_, asyncContext)), | ||
| 32 | + try_catch_(env->isolate()) { | ||
| 33 | 33 | try_catch_.SetVerbose(true); | |
| 34 | 34 | } | |
| 35 | 35 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1452,6 +1452,8 @@ class NODE_EXTERN CallbackScope { | |||
| 1452 | 1452 | CallbackScope(CallbackScope&&) = delete; | |
| 1453 | 1453 | ||
| 1454 | 1454 | private: | |
| 1455 | + void* reserved_; | ||
| 1456 | + v8::Local<v8::Object> resource_storage_; | ||
| 1455 | 1457 | InternalCallbackScope* private_; | |
| 1456 | 1458 | v8::TryCatch try_catch_; | |
| 1457 | 1459 | }; | |
0 commit comments