1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: remove calls to deprecated v8 functions (ToString)

Browse Source 
Remove all calls to deprecated v8 functions (here: Value::ToString)
inside the code (src directory only).

PR-URL: https://github.com/nodejs/node/pull/21935
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
Ujjwal Sharma 2018-08-29 15:39:09 +02:00 committed by Anna Henningsen
parent 86dc0ba6ac
commit 67403b3a84
No known key found for this signature in database
GPG Key ID: 9C63F3A6CD2AD8F9
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/spawn_sync.cc
View File

@ -981,7 +981,8 @@ int SyncProcessRunner::CopyJsString(Local<Value> js_value,
if (js_value->IsString())
js_string = js_value.As<String>();
else
js_string = js_value->ToString(env()->isolate());
js_string = js_value->ToString(env()->isolate()->GetCurrentContext())
.ToLocalChecked();
// Include space for null terminator byte.
size = StringBytes::StorageSize(isolate, js_string, UTF8) + 1;
@ -1025,7 +1026,12 @@ int SyncProcessRunner::CopyJsStringArray(Local<Value> js_value,
auto value = js_array->Get(context, i).ToLocalChecked();
if (!value->IsString())
js_array->Set(context, i, value->ToString(env()->isolate())).FromJust();
js_array
->Set(context,
i,
value->ToString(env()->isolate()->GetCurrentContext())
.ToLocalChecked())
.FromJust();
data_size += StringBytes::StorageSize(isolate, value, UTF8) + 1;
data_size = ROUND_UP(data_size, sizeof(void*));

6
src/string_bytes.cc
View File

@ -410,7 +410,8 @@ size_t StringBytes::StorageSize(Isolate* isolate,
return Buffer::Length(val);
}
Local<String> str = val->ToString(isolate);
Local<String> str =
val->ToString(isolate->GetCurrentContext()).ToLocalChecked();
switch (encoding) {
case ASCII:
@ -456,7 +457,8 @@ size_t StringBytes::Size(Isolate* isolate,
if (Buffer::HasInstance(val) && (encoding == BUFFER || encoding == LATIN1))
return Buffer::Length(val);
Local<String> str = val->ToString(isolate);
Local<String> str =
val->ToString(isolate->GetCurrentContext()).ToLocalChecked();
switch (encoding) {
case ASCII:

10
src/util.cc
View File

@ -38,9 +38,8 @@ template <typename T>
static void MakeUtf8String(Isolate* isolate,
Local<Value> value,
T* target) {
Local<String> string = value->ToString(isolate);
if (string.IsEmpty())
return;
Local<String> string;
if (!value->ToString(isolate->GetCurrentContext()).ToLocal(&string)) return;
const size_t storage = StringBytes::StorageSize(isolate, string, UTF8) + 1;
target->AllocateSufficientStorage(storage);
@ -64,9 +63,8 @@ TwoByteValue::TwoByteValue(Isolate* isolate, Local<Value> value) {
return;
}
Local<String> string = value->ToString(isolate);
if (string.IsEmpty())
return;
Local<String> string;
if (!value->ToString(isolate->GetCurrentContext()).ToLocal(&string)) return;
// Allocate enough space to include the null terminator
const size_t storage = string->Length() + 1;