src: replace uses of deprecated v8::External APIs

Author: gahaas

src/crypto/crypto_context.cc

@@ -2337,7 +2337,8 @@ int SecureContext::TicketCompatibilityCallback(SSL* ssl,
 void SecureContext::CtxGetter(const FunctionCallbackInfo<Value>& info) {
   SecureContext* sc;
   ASSIGN_OR_RETURN_UNWRAP(&sc, info.This());
-  Local<External> ext = External::New(info.GetIsolate(), sc->ctx_.get());
+  Local<External> ext = External::New(
+      info.GetIsolate(), sc->ctx_.get(), v8::kExternalPointerTypeTagDefault);
   info.GetReturnValue().Set(ext);
 }
 

src/js_native_api_v8.cc

@@ -355,8 +355,8 @@ inline napi_status Unwrap(napi_env env,
   auto val = obj->GetPrivate(context, NAPI_PRIVATE_KEY(context, wrapper))
                  .ToLocalChecked();
   RETURN_STATUS_IF_FALSE(env, val->IsExternal(), napi_invalid_arg);
-  Reference* reference =
-      static_cast<v8impl::Reference*>(val.As<v8::External>()->Value());
+  Reference* reference = static_cast<v8impl::Reference*>(
+      val.As<v8::External>()->Value(v8::kExternalPointerTypeTagDefault));
 
   if (result) {
     *result = reference->Data();
@@ -395,14 +395,16 @@ class CallbackBundle {
     bundle->cb_data = data;
     bundle->env = env;
 
-    v8::Local<v8::Value> cbdata = v8::External::New(env->isolate, bundle);
+    v8::Local<v8::Value> cbdata = v8::External::New(
+        env->isolate, bundle, v8::kExternalPointerTypeTagDefault);
     ReferenceWithFinalizer::New(
         env, cbdata, 0, ReferenceOwnership::kRuntime, Delete, bundle, nullptr);
     return cbdata;
   }
 
   static CallbackBundle* FromCallbackData(v8::Local<v8::Value> data) {
-    return reinterpret_cast<CallbackBundle*>(data.As<v8::External>()->Value());
+    return reinterpret_cast<CallbackBundle*>(
+        data.As<v8::External>()->Value(v8::kExternalPointerTypeTagDefault));
   }
 
  public:
@@ -573,9 +575,11 @@ inline napi_status Wrap(napi_env env,
         env, obj, 0, v8impl::ReferenceOwnership::kRuntime, native_object);
   }
 
-  CHECK(obj->SetPrivate(context,
-                        NAPI_PRIVATE_KEY(context, wrapper),
-                        v8::External::New(env->isolate, reference))
+  CHECK(obj->SetPrivate(
+               context,
+               NAPI_PRIVATE_KEY(context, wrapper),
+               v8::External::New(
+                   env->isolate, reference, v8::kExternalPointerTypeTagDefault))
             .FromJust());
 
   return GET_RETURN_STATUS(env);
@@ -842,7 +846,8 @@ class ExternalWrapper {
  public:
   static v8::Local<v8::External> New(napi_env env, void* data) {
     ExternalWrapper* wrapper = new ExternalWrapper(data);
-    v8::Local<v8::External> external = v8::External::New(env->isolate, wrapper);
+    v8::Local<v8::External> external = v8::External::New(
+        env->isolate, wrapper, v8::kExternalPointerTypeTagDefault);
     wrapper->persistent_.Reset(env->isolate, external);
     wrapper->persistent_.SetWeak(
         wrapper, WeakCallback, v8::WeakCallbackType::kParameter);
@@ -851,7 +856,8 @@ class ExternalWrapper {
   }
 
   static ExternalWrapper* From(v8::Local<v8::External> external) {
-    return static_cast<ExternalWrapper*>(external->Value());
+    return static_cast<ExternalWrapper*>(
+        external->Value(v8::kExternalPointerTypeTagDefault));
   }
 
   void* Data() { return data_; }

src/node_modules.cc

@@ -552,8 +552,10 @@ void GetCompileCacheEntry(const FunctionCallbackInfo<Value>& args) {
 
   v8::LocalVector<v8::Name> names(isolate,
                                   {FIXED_ONE_BYTE_STRING(isolate, "external")});
-  v8::LocalVector<v8::Value> values(isolate,
-                                    {v8::External::New(isolate, cache_entry)});
+  v8::LocalVector<v8::Value> values(
+      isolate,
+      {v8::External::New(
+          isolate, cache_entry, v8::kExternalPointerTypeTagDefault)});
   if (cache_entry->cache != nullptr) {
     Debug(env,
           DebugCategory::COMPILE_CACHE,
@@ -592,8 +594,8 @@ void SaveCompileCacheEntry(const FunctionCallbackInfo<Value>& args) {
   DCHECK(env->use_compile_cache());
   CHECK(args[0]->IsExternal());
   CHECK(args[1]->IsString());  // TODO(joyeecheung): accept buffer.
-  auto* cache_entry =
-      static_cast<CompileCacheEntry*>(args[0].As<External>()->Value());
+  auto* cache_entry = static_cast<CompileCacheEntry*>(
+      args[0].As<External>()->Value(v8::kExternalPointerTypeTagDefault));
   Utf8Value utf8(isolate, args[1].As<String>());
   env->compile_cache_handler()->MaybeSave(cache_entry, utf8.ToStringView());
 }

src/node_util.cc

@@ -93,7 +93,7 @@ static void GetExternalValue(
   Isolate* isolate = args.GetIsolate();
   Local<External> external = args[0].As<External>();
 
-  void* ptr = external->Value();
+  void* ptr = external->Value(v8::kExternalPointerTypeTagDefault);
   uint64_t value = reinterpret_cast<uint64_t>(ptr);
   Local<BigInt> ret = BigInt::NewFromUnsigned(isolate, value);
   args.GetReturnValue().Set(ret);

src/stream_base.cc

@@ -653,7 +653,8 @@ void StreamBase::GetExternal(const FunctionCallbackInfo<Value>& args) {
   StreamBase* wrap = StreamBase::FromObject(args.This().As<Object>());
   if (wrap == nullptr) return;
 
-  Local<External> ext = External::New(args.GetIsolate(), wrap);
+  Local<External> ext = External::New(
+      args.GetIsolate(), wrap, v8::kExternalPointerTypeTagDefault);
   args.GetReturnValue().Set(ext);
 }
 

test/cctest/test_environment.cc

@@ -700,14 +700,18 @@ TEST_F(EnvironmentTest, NestedMicrotaskQueue) {
 
   using IntVec = std::vector<int>;
   IntVec callback_calls;
-  v8::Local<v8::Function> must_call = v8::Function::New(
-      context,
-      [](const v8::FunctionCallbackInfo<v8::Value>& info) {
-        IntVec* callback_calls = static_cast<IntVec*>(
-            info.Data().As<v8::External>()->Value());
-        callback_calls->push_back(info[0].As<v8::Int32>()->Value());
-      },
-      v8::External::New(isolate_, static_cast<void*>(&callback_calls)))
+  v8::Local<v8::Function> must_call =
+      v8::Function::New(
+          context,
+          [](const v8::FunctionCallbackInfo<v8::Value>& info) {
+            IntVec* callback_calls =
+                static_cast<IntVec*>(info.Data().As<v8::External>()->Value(
+                    v8::kExternalPointerTypeTagDefault));
+            callback_calls->push_back(info[0].As<v8::Int32>()->Value());
+          },
+          v8::External::New(isolate_,
+                            static_cast<void*>(&callback_calls),
+                            v8::kExternalPointerTypeTagDefault))
           .ToLocalChecked();
   context->Global()->Set(
       context,