src: access ContextifyContext* more directly in property cbs

PR-URL: #20455
Fixes: #18897
Reviewed-By: Gus Caplan <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>

Author: addaleax

src/node_contextify.cc

@@ -121,7 +121,7 @@ Local<Value> ContextifyContext::CreateDataWrapper(Environment* env) {
   if (wrapper.IsEmpty())
     return scope.Escape(Local<Value>::New(env->isolate(), Local<Value>()));
 
-  Wrap(wrapper, this);
+  wrapper->SetAlignedPointerInInternalField(0, this);
   return scope.Escape(wrapper);
 }
 
@@ -291,12 +291,19 @@ ContextifyContext* ContextifyContext::ContextFromContextifiedSandbox(
   return nullptr;
 }
 
+// static
+template <typename T>
+ContextifyContext* ContextifyContext::Get(const PropertyCallbackInfo<T>& args) {
+  Local<Value> data = args.Data();
+  return static_cast<ContextifyContext*>(
+      data.As<Object>()->GetAlignedPointerFromInternalField(0));
+}
+
 // static
 void ContextifyContext::PropertyGetterCallback(
     Local<Name> property,
     const PropertyCallbackInfo<Value>& args) {
-  ContextifyContext* ctx;
-  ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Data().As<Object>());
+  ContextifyContext* ctx = ContextifyContext::Get(args);
 
   // Still initializing
   if (ctx->context_.IsEmpty())
@@ -325,8 +332,7 @@ void ContextifyContext::PropertySetterCallback(
     Local<Name> property,
     Local<Value> value,
     const PropertyCallbackInfo<Value>& args) {
-  ContextifyContext* ctx;
-  ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Data().As<Object>());
+  ContextifyContext* ctx = ContextifyContext::Get(args);
 
   // Still initializing
   if (ctx->context_.IsEmpty())
@@ -386,8 +392,7 @@ void ContextifyContext::PropertySetterCallback(
 void ContextifyContext::PropertyDescriptorCallback(
     Local<Name> property,
     const PropertyCallbackInfo<Value>& args) {
-  ContextifyContext* ctx;
-  ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Data().As<Object>());
+  ContextifyContext* ctx = ContextifyContext::Get(args);
 
   // Still initializing
   if (ctx->context_.IsEmpty())
@@ -409,8 +414,7 @@ void ContextifyContext::PropertyDefinerCallback(
     Local<Name> property,
     const PropertyDescriptor& desc,
     const PropertyCallbackInfo<Value>& args) {
-  ContextifyContext* ctx;
-  ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Data().As<Object>());
+  ContextifyContext* ctx = ContextifyContext::Get(args);
 
   // Still initializing
   if (ctx->context_.IsEmpty())
@@ -472,8 +476,7 @@ void ContextifyContext::PropertyDefinerCallback(
 void ContextifyContext::PropertyDeleterCallback(
     Local<Name> property,
     const PropertyCallbackInfo<Boolean>& args) {
-  ContextifyContext* ctx;
-  ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Data().As<Object>());
+  ContextifyContext* ctx = ContextifyContext::Get(args);
 
   // Still initializing
   if (ctx->context_.IsEmpty())
@@ -492,8 +495,7 @@ void ContextifyContext::PropertyDeleterCallback(
 // static
 void ContextifyContext::PropertyEnumeratorCallback(
     const PropertyCallbackInfo<Array>& args) {
-  ContextifyContext* ctx;
-  ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Data().As<Object>());
+  ContextifyContext* ctx = ContextifyContext::Get(args);
 
   // Still initializing
   if (ctx->context_.IsEmpty())
@@ -506,8 +508,7 @@ void ContextifyContext::PropertyEnumeratorCallback(
 void ContextifyContext::IndexedPropertyGetterCallback(
     uint32_t index,
     const PropertyCallbackInfo<Value>& args) {
-  ContextifyContext* ctx;
-  ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Data().As<Object>());
+  ContextifyContext* ctx = ContextifyContext::Get(args);
 
   // Still initializing
   if (ctx->context_.IsEmpty())
@@ -522,8 +523,7 @@ void ContextifyContext::IndexedPropertySetterCallback(
     uint32_t index,
     Local<Value> value,
     const PropertyCallbackInfo<Value>& args) {
-  ContextifyContext* ctx;
-  ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Data().As<Object>());
+  ContextifyContext* ctx = ContextifyContext::Get(args);
 
   // Still initializing
   if (ctx->context_.IsEmpty())
@@ -537,8 +537,7 @@ void ContextifyContext::IndexedPropertySetterCallback(
 void ContextifyContext::IndexedPropertyDescriptorCallback(
     uint32_t index,
     const PropertyCallbackInfo<Value>& args) {
-  ContextifyContext* ctx;
-  ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Data().As<Object>());
+  ContextifyContext* ctx = ContextifyContext::Get(args);
 
   // Still initializing
   if (ctx->context_.IsEmpty())
@@ -553,8 +552,7 @@ void ContextifyContext::IndexedPropertyDefinerCallback(
     uint32_t index,
     const PropertyDescriptor& desc,
     const PropertyCallbackInfo<Value>& args) {
-  ContextifyContext* ctx;
-  ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Data().As<Object>());
+  ContextifyContext* ctx = ContextifyContext::Get(args);
 
   // Still initializing
   if (ctx->context_.IsEmpty())
@@ -568,8 +566,7 @@ void ContextifyContext::IndexedPropertyDefinerCallback(
 void ContextifyContext::IndexedPropertyDeleterCallback(
     uint32_t index,
     const PropertyCallbackInfo<Boolean>& args) {
-  ContextifyContext* ctx;
-  ASSIGN_OR_RETURN_UNWRAP(&ctx, args.Data().As<Object>());
+  ContextifyContext* ctx = ContextifyContext::Get(args);
 
   // Still initializing
   if (ctx->context_.IsEmpty())

src/node_contextify.h

@@ -55,6 +55,9 @@ class ContextifyContext {
         context()->GetEmbedderData(ContextEmbedderIndex::kSandboxObject));
   }
 
+  template <typename T>
+  static ContextifyContext* Get(const v8::PropertyCallbackInfo<T>& args);
+
  private:
   static void MakeContext(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void IsContext(const v8::FunctionCallbackInfo<v8::Value>& args);