Revert "src: remove calls to deprecated v8 functions (IntegerValue)"

This reverts commit 2555cb4.
nodejs · refack · Oct 12, 2018 · Oct 25, 2018 · Oct 21, 2018 · Oct 25, 2018
commit 72ffab8bcbbd158a852446c4a6b1fd6ad6eeb460
diff --git a/src/node.cc b/src/node.cc
@@ -2217,10 +2217,11 @@ void DebugProcess(const FunctionCallbackInfo<Value>& args) {
     return env->ThrowError("Invalid number of arguments.");
   }
 
-  CHECK(args[0]->IsNumber());
-  pid_t pid = args[0].As<Integer>()->Value();
-  int r = kill(pid, SIGUSR1);
+  pid_t pid;
+  int r;
 
+  pid = args[0]->IntegerValue();
+  r = kill(pid, SIGUSR1);
   if (r != 0) {
     return env->ThrowErrnoException(errno, "kill");
   }
@@ -2262,8 +2263,7 @@ static void DebugProcess(const FunctionCallbackInfo<Value>& args) {
       CloseHandle(mapping);
   });
 
-  CHECK(args[0]->IsNumber());
-  pid = args[0].As<Integer>()->Value();
+  pid = (DWORD) args[0]->IntegerValue();
 
   process = OpenProcess(PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION |
                             PROCESS_VM_OPERATION | PROCESS_VM_WRITE |

diff --git a/src/node_buffer.cc b/src/node_buffer.cc
@@ -170,8 +170,7 @@ inline MUST_USE_RESULT bool ParseArrayIndex(Local<Value> arg,
     return true;
   }
 
-  CHECK(arg->IsNumber());
-  int64_t tmp_i = arg.As<Integer>()->Value();
+  int64_t tmp_i = arg->IntegerValue();
 
   if (tmp_i < 0)
     return false;
@@ -772,7 +771,7 @@ void IndexOfString(const FunctionCallbackInfo<Value>& args) {
   SPREAD_BUFFER_ARG(args[0], ts_obj);
 
   Local<String> needle = args[1].As<String>();
-  int64_t offset_i64 = args[2].As<Integer>()->Value();
+  int64_t offset_i64 = args[2]->IntegerValue();
   bool is_forward = args[4]->IsTrue();
 
   const char* haystack = ts_obj_data;
@@ -888,7 +887,7 @@ void IndexOfBuffer(const FunctionCallbackInfo<Value>& args) {
   THROW_AND_RETURN_UNLESS_BUFFER(Environment::GetCurrent(args), args[1]);
   SPREAD_BUFFER_ARG(args[0], ts_obj);
   SPREAD_BUFFER_ARG(args[1], buf);
-  int64_t offset_i64 = args[2].As<Integer>()->Value();
+  int64_t offset_i64 = args[2]->IntegerValue();
   bool is_forward = args[4]->IsTrue();
 
   const char* haystack = ts_obj_data;
@@ -958,7 +957,7 @@ void IndexOfNumber(const FunctionCallbackInfo<Value>& args) {
   SPREAD_BUFFER_ARG(args[0], ts_obj);
 
   uint32_t needle = args[1].As<Uint32>()->Value();
-  int64_t offset_i64 = args[2].As<Integer>()->Value();
+  int64_t offset_i64 = args[2]->IntegerValue();
   bool is_forward = args[3]->IsTrue();
 
   int64_t opt_offset = IndexOfOffset(ts_obj_length, offset_i64, 1, is_forward);

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -977,16 +977,15 @@ void SecureContext::SetDHParam(const FunctionCallbackInfo<Value>& args) {
 void SecureContext::SetOptions(const FunctionCallbackInfo<Value>& args) {
   SecureContext* sc;
   ASSIGN_OR_RETURN_UNWRAP(&sc, args.Holder());
-  int64_t val;
 
-  if (args.Length() != 1 ||
-      !args[0]->IntegerValue(args.GetIsolate()->GetCurrentContext()).To(&val)) {
+  if (args.Length() != 1 || !args[0]->IntegerValue()) {
     return THROW_ERR_INVALID_ARG_TYPE(
         sc->env(), "Options must be an integer value");
   }
 
-  SSL_CTX_set_options(sc->ctx_.get(),
-                      static_cast<long>(val));  // NOLINT(runtime/int)
+  SSL_CTX_set_options(
+      sc->ctx_.get(),
+      static_cast<long>(args[0]->IntegerValue()));  // NOLINT(runtime/int)
 }
 
 

diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc
@@ -289,16 +289,12 @@ class Parser : public AsyncWrap, public StreamListener {
     MaybeLocal<Value> head_response =
         MakeCallback(cb.As<Function>(), arraysize(argv), argv);
 
-    int64_t val;
-
-    if (head_response.IsEmpty() || !head_response.ToLocalChecked()
-                                        ->IntegerValue(env()->context())
-                                        .To(&val)) {
+    if (head_response.IsEmpty()) {
       got_exception_ = true;
       return -1;
     }
 
-    return val;
+    return head_response.ToLocalChecked()->IntegerValue();
   }
 
 

diff --git a/src/process_wrap.cc b/src/process_wrap.cc
@@ -128,9 +128,8 @@ class ProcessWrap : public HandleWrap {
         options->stdio[i].data.stream = StreamForWrap(env, stdio);
       } else {
         Local<String> fd_key = env->fd_string();
-        Local<Value> fd_value = stdio->Get(context, fd_key).ToLocalChecked();
-        CHECK(fd_value->IsNumber());
-        int fd = static_cast<int>(fd_value.As<Integer>()->Value());
+        int fd = static_cast<int>(
+            stdio->Get(context, fd_key).ToLocalChecked()->IntegerValue());
         options->stdio[i].flags = UV_INHERIT_FD;
         options->stdio[i].data.fd = fd;
       }

diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
@@ -207,10 +207,7 @@ void TCPWrap::Open(const FunctionCallbackInfo<Value>& args) {
   ASSIGN_OR_RETURN_UNWRAP(&wrap,
                           args.Holder(),
                           args.GetReturnValue().Set(UV_EBADF));
-  int64_t val;
-  if (!args[0]->IntegerValue(args.GetIsolate()->GetCurrentContext()).To(&val))
-    return;
-  int fd = static_cast<int>(val);
+  int fd = static_cast<int>(args[0]->IntegerValue());
   int err = uv_tcp_open(&wrap->handle_, fd);
 
   if (err == 0)