src: access ContextifyContext* more directly in property cbs

PR-URL: #20455 Fixes: #18897 Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>

Author: addaleax

src/node_contextify.cc

@@ -120,7 +120,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);
 }
 
@@ -290,12 +290,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())
@@ -324,8 +331,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())
@@ -385,8 +391,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())
@@ -408,8 +413,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())
@@ -471,8 +475,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())
@@ -491,8 +494,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())
@@ -505,8 +507,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())
@@ -521,8 +522,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())
@@ -536,8 +536,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())
@@ -552,8 +551,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())
@@ -567,8 +565,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);