src: add env->cppgc_allocation_handle() convenience method

jasnell · targos · commit ca0f5a0188c8 · 2025-05-31T15:02:41.000+02:00
Reduce some of the boilerplate code needed to access the cppgc::AllocationHandle from the Node.js Environment. PR-URL: #58483 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
diff --git a/src/README.md b/src/README.md
@@ -1193,7 +1193,7 @@ MyWrap* MyWrap::New(Environment* env, v8::Local<v8::Object> object) {
   // pointer with this, as this is not managed by the native memory
   // allocator but by V8.
   return cppgc::MakeGarbageCollected<MyWrap>(
-      env->isolate()->GetCppHeap()->GetAllocationHandle(), env, object);
+      env->cppgc_allocation_handle(), env, object);
 }
 
 // Binding method to be invoked by JavaScript.
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -205,6 +205,10 @@ inline v8::Isolate* Environment::isolate() const {
   return isolate_;
 }
 
+inline cppgc::AllocationHandle& Environment::cppgc_allocation_handle() const {
+  return isolate_->GetCppHeap()->GetAllocationHandle();
+}
+
 inline v8::ExternalMemoryAccounter* Environment::external_memory_accounter()
     const {
   return external_memory_accounter_;
diff --git a/src/env.h b/src/env.h
@@ -692,6 +692,7 @@ class Environment final : public MemoryRetainer {
   void StartProfilerIdleNotifier();
 
   inline v8::Isolate* isolate() const;
+  inline cppgc::AllocationHandle& cppgc_allocation_handle() const;
   inline v8::ExternalMemoryAccounter* external_memory_accounter() const;
   inline uv_loop_t* event_loop() const;
   void TryLoadAddon(const char* filename,
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
@@ -330,11 +330,7 @@ ContextifyContext* ContextifyContext::New(Local<Context> v8_context,
     }
     DCHECK_NOT_NULL(env->isolate()->GetCppHeap());
     result = cppgc::MakeGarbageCollected<ContextifyContext>(
-        env->isolate()->GetCppHeap()->GetAllocationHandle(),
-        env,
-        wrapper,
-        v8_context,
-        options);
+        env->cppgc_allocation_handle(), env, wrapper, v8_context, options);
   }
 
   Local<Object> wrapper_holder =
@@ -975,7 +971,7 @@ ContextifyScript* ContextifyScript::New(Environment* env,
                                         Local<Object> object) {
   DCHECK_NOT_NULL(env->isolate()->GetCppHeap());
   return cppgc::MakeGarbageCollected<ContextifyScript>(
-      env->isolate()->GetCppHeap()->GetAllocationHandle(), env, object);
+      env->cppgc_allocation_handle(), env, object);
 }
 
 void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {

Original file line number	Diff line number	Diff line change
`@@ -1193,7 +1193,7 @@ MyWrap* MyWrap::New(Environment* env, v8::Local<v8::Object> object) {`
`1193`	`1193`	`// pointer with this, as this is not managed by the native memory`
`1194`	`1194`	`// allocator but by V8.`
`1195`	`1195`	`return cppgc::MakeGarbageCollected<MyWrap>(`
`1196`		`- env->isolate()->GetCppHeap()->GetAllocationHandle(), env, object);`
	`1196`	`+ env->cppgc_allocation_handle(), env, object);`
`1197`	`1197`	`}`
`1198`	`1198`
`1199`	`1199`	`// Binding method to be invoked by JavaScript.`
Original file line number	Diff line number	Diff line change
`@@ -330,11 +330,7 @@ ContextifyContext* ContextifyContext::New(Local<Context> v8_context,`
`330`	`330`	`}`
`331`	`331`	`DCHECK_NOT_NULL(env->isolate()->GetCppHeap());`
`332`	`332`	`result = cppgc::MakeGarbageCollected<ContextifyContext>(`
`333`		`- env->isolate()->GetCppHeap()->GetAllocationHandle(),`
`334`		`- env,`
`335`		`- wrapper,`
`336`		`- v8_context,`
`337`		`- options);`
	`333`	`+ env->cppgc_allocation_handle(), env, wrapper, v8_context, options);`
`338`	`334`	`}`
`339`	`335`
`340`	`336`	`Local<Object> wrapper_holder =`
`@@ -975,7 +971,7 @@ ContextifyScript* ContextifyScript::New(Environment* env,`
`975`	`971`	`Local<Object> object) {`
`976`	`972`	`DCHECK_NOT_NULL(env->isolate()->GetCppHeap());`
`977`	`973`	`return cppgc::MakeGarbageCollected<ContextifyScript>(`
`978`		`- env->isolate()->GetCppHeap()->GetAllocationHandle(), env, object);`
	`974`	`+ env->cppgc_allocation_handle(), env, object);`
`979`	`975`	`}`
`980`	`976`
`981`	`977`	`void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {`