src: replace Environment::GetCurrent with args.GetIsolate

Author: KimSH39

src/node_util.cc

@@ -53,8 +53,8 @@ CHAR_TEST(16, IsUnicodeSurrogateTrail, (ch & 0x400) != 0)
 
 static void GetOwnNonIndexProperties(
     const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-  Local<Context> context = env->context();
+  Isolate* isolate = args.GetIsolate();
+  Local<Context> context = isolate->GetCurrentContext();
 
   CHECK(args[0]->IsObject());
   CHECK(args[1]->IsUint32());
@@ -168,7 +168,7 @@ static void PreviewEntries(const FunctionCallbackInfo<Value>& args) {
   if (!args[0]->IsObject())
     return;
 
-  Environment* env = Environment::GetCurrent(args);
+  Isolate* isolate = args.GetIsolate();
   bool is_key_value;
   Local<Array> entries;
   if (!args[0].As<Object>()->PreviewEntries(&is_key_value).ToLocal(&entries))
@@ -179,10 +179,10 @@ static void PreviewEntries(const FunctionCallbackInfo<Value>& args) {
 
   Local<Value> ret[] = {
     entries,
-    Boolean::New(env->isolate(), is_key_value)
+    Boolean::New(isolate, is_key_value)
   };
   return args.GetReturnValue().Set(
-      Array::New(env->isolate(), ret, arraysize(ret)));
+      Array::New(isolate, ret, arraysize(ret)));
 }
 
 static void Sleep(const FunctionCallbackInfo<Value>& args) {
@@ -222,9 +222,10 @@ static uint32_t GetUVHandleTypeCode(const uv_handle_type type) {
 }
 
 static void GuessHandleType(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
+  Isolate* isolate = args.GetIsolate();
+  Local<Context> context = isolate->GetCurrentContext();
   int fd;
-  if (!args[0]->Int32Value(env->context()).To(&fd)) return;
+  if (!args[0]->Int32Value(context).To(&fd)) return;
   CHECK_GE(fd, 0);
 
   uv_handle_type t = uv_guess_handle(fd);
@@ -239,10 +240,12 @@ static uint32_t FastGuessHandleType(Local<Value> receiver, const uint32_t fd) {
 CFunction fast_guess_handle_type_(CFunction::Make(FastGuessHandleType));
 
 static void ParseEnv(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
+  Isolate* isolate = args.GetIsolate();
+  Local<Context> context = isolate->GetCurrentContext();
+  Environment* env = Environment::GetCurrent(context);
   CHECK_EQ(args.Length(), 1);  // content
   CHECK(args[0]->IsString());
-  Utf8Value content(env->isolate(), args[0]);
+  Utf8Value content(isolate, args[0]);
   Dotenv dotenv{};
   dotenv.ParseContent(content.ToStringView());
   Local<Object> obj;
@@ -252,8 +255,9 @@ static void ParseEnv(const FunctionCallbackInfo<Value>& args) {
 }
 
 static void GetCallSites(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-  Isolate* isolate = env->isolate();
+  Isolate* isolate = args.GetIsolate();
+  Local<Context> context = isolate->GetCurrentContext();
+  Environment* env = Environment::GetCurrent(context);
 
   CHECK_EQ(args.Length(), 1);
   CHECK(args[0]->IsNumber());
@@ -307,7 +311,7 @@ static void GetCallSites(const FunctionCallbackInfo<Value>& args) {
 
     Local<Object> callsite;
     if (!NewDictionaryInstanceNullProto(
-             env->context(), callsite_template, values)
+             context, callsite_template, values)
              .ToLocal(&callsite)) {
       return;
     }

src/uv.cc

@@ -68,7 +68,9 @@ void GetErrMessage(const FunctionCallbackInfo<Value>& args) {
 }
 
 void ErrName(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
+  Isolate* isolate = args.GetIsolate();
+  Local<Context> context = isolate->GetCurrentContext();
+  Environment* env = Environment::GetCurrent(context);
   if (env->options()->pending_deprecation && env->EmitErrNameWarning()) {
     if (ProcessEmitDeprecationWarning(
         env,
@@ -82,13 +84,12 @@ void ErrName(const FunctionCallbackInfo<Value>& args) {
   CHECK_LT(err, 0);
   char name[50];
   uv_err_name_r(err, name, sizeof(name));
-  args.GetReturnValue().Set(OneByteString(env->isolate(), name));
+  args.GetReturnValue().Set(OneByteString(isolate, name));
 }
 
 void GetErrMap(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-  Isolate* isolate = env->isolate();
-  Local<Context> context = env->context();
+  Isolate* isolate = args.GetIsolate();
+  Local<Context> context = isolate->GetCurrentContext();
 
   // This can't return a SafeMap, because the uv binding can be referenced
   // by user code by using `process.binding('uv').getErrorMap()`: