Skip to content

src,deps: backport and use non-deprecated V8 methods with isolate #22531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
targos wants to merge 6 commits into from
Closed

src,deps: backport and use non-deprecated V8 methods with isolate #22531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64154c3
deps: backport StackFrame::GetFrame with isolate
targos Aug 26, 2018
bafe937
src: use StackFrame::GetFrame with isolate
targos Aug 26, 2018
845bf71
deps: backport String::Write{OneByte,Utf8} with isolate
targos Aug 26, 2018
85833b1
src: use String::Write{OneByte,Utf8} with isolate
targos Aug 26, 2018
761c0a0
deps: backport String::Utf8Length with isolate
targos Aug 26, 2018
fc0b211
src: use String::Utf8Length with isolate
targos Aug 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
src: use String::Utf8Length with isolate
  • Loading branch information
@targos
targos committed Aug 29, 2018
commit fc0b211808e35b60bde57323bb1420417cdbe880
2 changes: 1 addition & 1 deletion benchmark/napi/function_args/binding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ void CallWithString(const FunctionCallbackInfo<Value>& args) {
assert(args.Length() == 1 && args[0]->IsString());
if (args.Length() == 1 && args[0]->IsString()) {
Local<String> str = args[0].As<String>();
const int32_t length = str->Utf8Length() + 1;
const int32_t length = str->Utf8Length(args.GetIsolate()) + 1;
char* buf = new char[length];
str->WriteUtf8(args.GetIsolate(), buf, length);
delete [] buf;
Expand Down
2 changes: 1 addition & 1 deletion src/node_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2399,7 +2399,7 @@ napi_status napi_get_value_string_utf8(napi_env env,

if (!buf) {
CHECK_ARG(env, result);
*result = val.As<v8::String>()->Utf8Length();
*result = val.As<v8::String>()->Utf8Length(env->isolate);
} else {
int copied = val.As<v8::String>()->WriteUtf8(
env->isolate,
Expand Down
7 changes: 4 additions & 3 deletions src/node_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ void Fill(const FunctionCallbackInfo<Value>& args) {
// Can't use StringBytes::Write() in all cases. For example if attempting
// to write a two byte character into a one byte Buffer.
if (enc == UTF8) {
str_length = str_obj->Utf8Length();
str_length = str_obj->Utf8Length(env->isolate());
node::Utf8Value str(env->isolate(), args[1]);
memcpy(ts_obj_data + start, *str, MIN(str_length, fill_length));

Expand Down Expand Up @@ -689,10 +689,11 @@ void StringWrite(const FunctionCallbackInfo<Value>& args) {
}

void ByteLengthUtf8(const FunctionCallbackInfo<Value> &args) {
Environment* env = Environment::GetCurrent(args);
CHECK(args[0]->IsString());

// Fast case: avoid StringBytes on UTF8 string. Jump to v8.
args.GetReturnValue().Set(args[0].As<String>()->Utf8Length());
args.GetReturnValue().Set(args[0].As<String>()->Utf8Length(env->isolate()));
}

// Normalize val to be an integer in the range of [1, -1] since
Expand Down Expand Up @@ -1062,7 +1063,7 @@ static void EncodeUtf8String(const FunctionCallbackInfo<Value>& args) {
CHECK(args[0]->IsString());

Local<String> str = args[0].As<String>();
size_t length = str->Utf8Length();
size_t length = str->Utf8Length(isolate);
char* data = node::UncheckedMalloc(length);
str->WriteUtf8(isolate,
data,
Expand Down
2 changes: 1 addition & 1 deletion src/string_bytes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ size_t StringBytes::Size(Isolate* isolate,

case BUFFER:
case UTF8:
return str->Utf8Length();
return str->Utf8Length(isolate);

case UCS2:
return str->Length() * sizeof(uint16_t);
Expand Down