Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 57302f8

Browse filesBrowse files
addaleaxcodebytere
addaleax
authored and
codebytere
committed
src: prefer 3-argument Array::New()
This is nicer, because: 1. It reduces overall code size, 2. It’s faster, because `Object::Set()` calls are relatively slow, and 3. It helps avoid invalid `.Check()`/`.FromJust()` calls. PR-URL: #31775 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com>
1 parent db291aa commit 57302f8
Copy full SHA for 57302f8

File tree

Expand file treeCollapse file tree

7 files changed

+85
-103
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

7 files changed

+85
-103
lines changed
Open diff view settings
Collapse file

‎src/cares_wrap.cc‎

Copy file name to clipboardExpand all lines: src/cares_wrap.cc
+14-16Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -749,16 +749,12 @@ Local<Array> AddrTTLToArray(Environment* env,
749749
const T* addrttls,
750750
size_t naddrttls) {
751751
auto isolate = env->isolate();
752-
EscapableHandleScope escapable_handle_scope(isolate);
753-
auto context = env->context();
754752

755-
Local<Array> ttls = Array::New(isolate, naddrttls);
756-
for (size_t i = 0; i < naddrttls; i++) {
757-
auto value = Integer::NewFromUnsigned(isolate, addrttls[i].ttl);
758-
ttls->Set(context, i, value).Check();
759-
}
753+
MaybeStackBuffer<Local<Value>, 8> ttls(naddrttls);
754+
for (size_t i = 0; i < naddrttls; i++)
755+
ttls[i] = Integer::NewFromUnsigned(isolate, addrttls[i].ttl);
760756

761-
return escapable_handle_scope.Escape(ttls);
757+
return Array::New(isolate, ttls.out(), naddrttls);
762758
}
763759

764760

@@ -2039,6 +2035,7 @@ void GetServers(const FunctionCallbackInfo<Value>& args) {
20392035

20402036
int r = ares_get_servers_ports(channel->cares_channel(), &servers);
20412037
CHECK_EQ(r, ARES_SUCCESS);
2038+
auto cleanup = OnScopeLeave([&]() { ares_free_data(servers); });
20422039

20432040
ares_addr_port_node* cur = servers;
20442041

@@ -2049,17 +2046,18 @@ void GetServers(const FunctionCallbackInfo<Value>& args) {
20492046
int err = uv_inet_ntop(cur->family, caddr, ip, sizeof(ip));
20502047
CHECK_EQ(err, 0);
20512048

2052-
Local<Array> ret = Array::New(env->isolate(), 2);
2053-
ret->Set(env->context(), 0, OneByteString(env->isolate(), ip)).Check();
2054-
ret->Set(env->context(),
2055-
1,
2056-
Integer::New(env->isolate(), cur->udp_port)).Check();
2049+
Local<Value> ret[] = {
2050+
OneByteString(env->isolate(), ip),
2051+
Integer::New(env->isolate(), cur->udp_port)
2052+
};
20572053

2058-
server_array->Set(env->context(), i, ret).Check();
2054+
if (server_array->Set(env->context(), i,
2055+
Array::New(env->isolate(), ret, arraysize(ret)))
2056+
.IsNothing()) {
2057+
return;
2058+
}
20592059
}
20602060

2061-
ares_free_data(servers);
2062-
20632061
args.GetReturnValue().Set(server_array);
20642062
}
20652063

Collapse file

‎src/js_stream.cc‎

Copy file name to clipboardExpand all lines: src/js_stream.cc
+4-5Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,15 @@ int JSStream::DoWrite(WriteWrap* w,
116116
HandleScope scope(env()->isolate());
117117
Context::Scope context_scope(env()->context());
118118

119-
Local<Array> bufs_arr = Array::New(env()->isolate(), count);
120-
Local<Object> buf;
119+
MaybeStackBuffer<Local<Value>, 16> bufs_arr(count);
121120
for (size_t i = 0; i < count; i++) {
122-
buf = Buffer::Copy(env(), bufs[i].base, bufs[i].len).ToLocalChecked();
123-
bufs_arr->Set(env()->context(), i, buf).Check();
121+
bufs_arr[i] =
122+
Buffer::Copy(env(), bufs[i].base, bufs[i].len).ToLocalChecked();
124123
}
125124

126125
Local<Value> argv[] = {
127126
w->object(),
128-
bufs_arr
127+
Array::New(env()->isolate(), bufs_arr.out(), count)
129128
};
130129

131130
TryCatchScope try_catch(env());
Collapse file

‎src/module_wrap.cc‎

Copy file name to clipboardExpand all lines: src/module_wrap.cc
+10-8Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,11 @@ void ModuleWrap::Link(const FunctionCallbackInfo<Value>& args) {
264264
Local<Context> mod_context = obj->context_.Get(isolate);
265265
Local<Module> module = obj->module_.Get(isolate);
266266

267-
Local<Array> promises = Array::New(isolate,
268-
module->GetModuleRequestsLength());
267+
const int module_requests_length = module->GetModuleRequestsLength();
268+
MaybeStackBuffer<Local<Value>, 16> promises(module_requests_length);
269269

270270
// call the dependency resolve callbacks
271-
for (int i = 0; i < module->GetModuleRequestsLength(); i++) {
271+
for (int i = 0; i < module_requests_length; i++) {
272272
Local<String> specifier = module->GetModuleRequest(i);
273273
Utf8Value specifier_utf8(env->isolate(), specifier);
274274
std::string specifier_std(*specifier_utf8, specifier_utf8.length());
@@ -290,10 +290,11 @@ void ModuleWrap::Link(const FunctionCallbackInfo<Value>& args) {
290290
Local<Promise> resolve_promise = resolve_return_value.As<Promise>();
291291
obj->resolve_cache_[specifier_std].Reset(env->isolate(), resolve_promise);
292292

293-
promises->Set(mod_context, i, resolve_promise).Check();
293+
promises[i] = resolve_promise;
294294
}
295295

296-
args.GetReturnValue().Set(promises);
296+
args.GetReturnValue().Set(
297+
Array::New(isolate, promises.out(), promises.length()));
297298
}
298299

299300
void ModuleWrap::Instantiate(const FunctionCallbackInfo<Value>& args) {
@@ -426,12 +427,13 @@ void ModuleWrap::GetStaticDependencySpecifiers(
426427

427428
int count = module->GetModuleRequestsLength();
428429

429-
Local<Array> specifiers = Array::New(env->isolate(), count);
430+
MaybeStackBuffer<Local<Value>, 16> specifiers(count);
430431

431432
for (int i = 0; i < count; i++)
432-
specifiers->Set(env->context(), i, module->GetModuleRequest(i)).Check();
433+
specifiers[i] = module->GetModuleRequest(i);
433434

434-
args.GetReturnValue().Set(specifiers);
435+
args.GetReturnValue().Set(
436+
Array::New(env->isolate(), specifiers.out(), count));
435437
}
436438

437439
void ModuleWrap::GetError(const FunctionCallbackInfo<Value>& args) {
Collapse file

‎src/node_crypto.cc‎

Copy file name to clipboardExpand all lines: src/node_crypto.cc
+34-44Lines changed: 34 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,19 +1011,19 @@ static X509_STORE* NewRootCertStore() {
10111011

10121012
void GetRootCertificates(const FunctionCallbackInfo<Value>& args) {
10131013
Environment* env = Environment::GetCurrent(args);
1014-
Local<Array> result = Array::New(env->isolate(), arraysize(root_certs));
1014+
Local<Value> result[arraysize(root_certs)];
10151015

10161016
for (size_t i = 0; i < arraysize(root_certs); i++) {
1017-
Local<Value> value;
1018-
if (!String::NewFromOneByte(env->isolate(),
1019-
reinterpret_cast<const uint8_t*>(root_certs[i]),
1020-
NewStringType::kNormal).ToLocal(&value) ||
1021-
!result->Set(env->context(), i, value).FromMaybe(false)) {
1017+
if (!String::NewFromOneByte(
1018+
env->isolate(),
1019+
reinterpret_cast<const uint8_t*>(root_certs[i]),
1020+
NewStringType::kNormal).ToLocal(&result[i])) {
10221021
return;
10231022
}
10241023
}
10251024

1026-
args.GetReturnValue().Set(result);
1025+
args.GetReturnValue().Set(
1026+
Array::New(env->isolate(), result, arraysize(root_certs)));
10271027
}
10281028

10291029

@@ -2138,22 +2138,22 @@ static Local<Object> X509ToObject(Environment* env, X509* cert) {
21382138
StackOfASN1 eku(static_cast<STACK_OF(ASN1_OBJECT)*>(
21392139
X509_get_ext_d2i(cert, NID_ext_key_usage, nullptr, nullptr)));
21402140
if (eku) {
2141-
Local<Array> ext_key_usage = Array::New(env->isolate());
2141+
const int count = sk_ASN1_OBJECT_num(eku.get());
2142+
MaybeStackBuffer<Local<Value>, 16> ext_key_usage(count);
21422143
char buf[256];
21432144

21442145
int j = 0;
2145-
for (int i = 0; i < sk_ASN1_OBJECT_num(eku.get()); i++) {
2146+
for (int i = 0; i < count; i++) {
21462147
if (OBJ_obj2txt(buf,
21472148
sizeof(buf),
21482149
sk_ASN1_OBJECT_value(eku.get(), i), 1) >= 0) {
2149-
ext_key_usage->Set(context,
2150-
j++,
2151-
OneByteString(env->isolate(), buf)).Check();
2150+
ext_key_usage[j++] = OneByteString(env->isolate(), buf);
21522151
}
21532152
}
21542153

21552154
eku.reset();
2156-
info->Set(context, env->ext_key_usage_string(), ext_key_usage).Check();
2155+
info->Set(context, env->ext_key_usage_string(),
2156+
Array::New(env->isolate(), ext_key_usage.out(), count)).Check();
21572157
}
21582158

21592159
if (ASN1_INTEGER* serial_number = X509_get_serialNumber(cert)) {
@@ -6799,15 +6799,8 @@ void GenerateKeyPair(const FunctionCallbackInfo<Value>& args,
67996799
Local<Value> err, pubkey, privkey;
68006800
job->ToResult(&err, &pubkey, &privkey);
68016801

6802-
bool (*IsNotTrue)(Maybe<bool>) = [](Maybe<bool> maybe) {
6803-
return maybe.IsNothing() || !maybe.ToChecked();
6804-
};
6805-
Local<Array> ret = Array::New(env->isolate(), 3);
6806-
if (IsNotTrue(ret->Set(env->context(), 0, err)) ||
6807-
IsNotTrue(ret->Set(env->context(), 1, pubkey)) ||
6808-
IsNotTrue(ret->Set(env->context(), 2, privkey)))
6809-
return;
6810-
args.GetReturnValue().Set(ret);
6802+
Local<Value> ret[] = { err, pubkey, privkey };
6803+
args.GetReturnValue().Set(Array::New(env->isolate(), ret, arraysize(ret)));
68116804
}
68126805

68136806
void GenerateKeyPairRSA(const FunctionCallbackInfo<Value>& args) {
@@ -6940,17 +6933,6 @@ void GetSSLCiphers(const FunctionCallbackInfo<Value>& args) {
69406933
CHECK(ssl);
69416934

69426935
STACK_OF(SSL_CIPHER)* ciphers = SSL_get_ciphers(ssl.get());
6943-
int n = sk_SSL_CIPHER_num(ciphers);
6944-
Local<Array> arr = Array::New(env->isolate(), n);
6945-
6946-
for (int i = 0; i < n; ++i) {
6947-
const SSL_CIPHER* cipher = sk_SSL_CIPHER_value(ciphers, i);
6948-
arr->Set(env->context(),
6949-
i,
6950-
OneByteString(args.GetIsolate(),
6951-
SSL_CIPHER_get_name(cipher))).Check();
6952-
}
6953-
69546936
// TLSv1.3 ciphers aren't listed by EVP. There are only 5, we could just
69556937
// document them, but since there are only 5, easier to just add them manually
69566938
// and not have to explain their absence in the API docs. They are lower-cased
@@ -6963,13 +6945,20 @@ void GetSSLCiphers(const FunctionCallbackInfo<Value>& args) {
69636945
"tls_aes_128_ccm_sha256"
69646946
};
69656947

6948+
const int n = sk_SSL_CIPHER_num(ciphers);
6949+
std::vector<Local<Value>> arr(n + arraysize(TLS13_CIPHERS));
6950+
6951+
for (int i = 0; i < n; ++i) {
6952+
const SSL_CIPHER* cipher = sk_SSL_CIPHER_value(ciphers, i);
6953+
arr[i] = OneByteString(env->isolate(), SSL_CIPHER_get_name(cipher));
6954+
}
6955+
69666956
for (unsigned i = 0; i < arraysize(TLS13_CIPHERS); ++i) {
69676957
const char* name = TLS13_CIPHERS[i];
6968-
arr->Set(env->context(),
6969-
arr->Length(), OneByteString(args.GetIsolate(), name)).Check();
6958+
arr[n + i] = OneByteString(env->isolate(), name);
69706959
}
69716960

6972-
args.GetReturnValue().Set(arr);
6961+
args.GetReturnValue().Set(Array::New(env->isolate(), arr.data(), arr.size()));
69736962
}
69746963

69756964

@@ -7020,22 +7009,23 @@ void GetHashes(const FunctionCallbackInfo<Value>& args) {
70207009
void GetCurves(const FunctionCallbackInfo<Value>& args) {
70217010
Environment* env = Environment::GetCurrent(args);
70227011
const size_t num_curves = EC_get_builtin_curves(nullptr, 0);
7023-
Local<Array> arr = Array::New(env->isolate(), num_curves);
70247012

70257013
if (num_curves) {
70267014
std::vector<EC_builtin_curve> curves(num_curves);
70277015

70287016
if (EC_get_builtin_curves(curves.data(), num_curves)) {
7029-
for (size_t i = 0; i < num_curves; i++) {
7030-
arr->Set(env->context(),
7031-
i,
7032-
OneByteString(env->isolate(),
7033-
OBJ_nid2sn(curves[i].nid))).Check();
7034-
}
7017+
std::vector<Local<Value>> arr(num_curves);
7018+
7019+
for (size_t i = 0; i < num_curves; i++)
7020+
arr[i] = OneByteString(env->isolate(), OBJ_nid2sn(curves[i].nid));
7021+
7022+
args.GetReturnValue().Set(
7023+
Array::New(env->isolate(), arr.data(), arr.size()));
7024+
return;
70357025
}
70367026
}
70377027

7038-
args.GetReturnValue().Set(arr);
7028+
args.GetReturnValue().Set(Array::New(env->isolate()));
70397029
}
70407030

70417031

Collapse file

‎src/node_file.cc‎

Copy file name to clipboardExpand all lines: src/node_file.cc
+10-17Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -700,16 +700,11 @@ void AfterScanDirWithTypes(uv_fs_t* req) {
700700
type_v.emplace_back(Integer::New(isolate, ent.type));
701701
}
702702

703-
Local<Array> result = Array::New(isolate, 2);
704-
result->Set(env->context(),
705-
0,
706-
Array::New(isolate, name_v.data(),
707-
name_v.size())).Check();
708-
result->Set(env->context(),
709-
1,
710-
Array::New(isolate, type_v.data(),
711-
type_v.size())).Check();
712-
req_wrap->Resolve(result);
703+
Local<Value> result[] = {
704+
Array::New(isolate, name_v.data(), name_v.size()),
705+
Array::New(isolate, type_v.data(), type_v.size())
706+
};
707+
req_wrap->Resolve(Array::New(isolate, result, arraysize(result)));
713708
}
714709

715710
void Access(const FunctionCallbackInfo<Value>& args) {
@@ -1519,13 +1514,11 @@ static void ReadDir(const FunctionCallbackInfo<Value>& args) {
15191514

15201515
Local<Array> names = Array::New(isolate, name_v.data(), name_v.size());
15211516
if (with_types) {
1522-
Local<Array> result = Array::New(isolate, 2);
1523-
result->Set(env->context(), 0, names).Check();
1524-
result->Set(env->context(),
1525-
1,
1526-
Array::New(isolate, type_v.data(),
1527-
type_v.size())).Check();
1528-
args.GetReturnValue().Set(result);
1517+
Local<Value> result[] = {
1518+
names,
1519+
Array::New(isolate, type_v.data(), type_v.size())
1520+
};
1521+
args.GetReturnValue().Set(Array::New(isolate, result, arraysize(result)));
15291522
} else {
15301523
args.GetReturnValue().Set(names);
15311524
}
Collapse file

‎src/node_v8.cc‎

Copy file name to clipboardExpand all lines: src/node_v8.cc
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,19 +218,19 @@ void Initialize(Local<Object> target,
218218
// Heap space names are extracted once and exposed to JavaScript to
219219
// avoid excessive creation of heap space name Strings.
220220
HeapSpaceStatistics s;
221-
const Local<Array> heap_spaces = Array::New(env->isolate(),
222-
number_of_heap_spaces);
221+
MaybeStackBuffer<Local<Value>, 16> heap_spaces(number_of_heap_spaces);
223222
for (size_t i = 0; i < number_of_heap_spaces; i++) {
224223
env->isolate()->GetHeapSpaceStatistics(&s, i);
225-
Local<String> heap_space_name = String::NewFromUtf8(env->isolate(),
226-
s.space_name(),
227-
NewStringType::kNormal)
228-
.ToLocalChecked();
229-
heap_spaces->Set(env->context(), i, heap_space_name).Check();
224+
heap_spaces[i] = String::NewFromUtf8(env->isolate(),
225+
s.space_name(),
226+
NewStringType::kNormal)
227+
.ToLocalChecked();
230228
}
231229
target->Set(env->context(),
232230
FIXED_ONE_BYTE_STRING(env->isolate(), "kHeapSpaces"),
233-
heap_spaces).Check();
231+
Array::New(env->isolate(),
232+
heap_spaces.out(),
233+
number_of_heap_spaces)).Check();
234234

235235
env->SetMethod(target,
236236
"updateHeapSpaceStatisticsArrayBuffer",
Collapse file

‎src/spawn_sync.cc‎

Copy file name to clipboardExpand all lines: src/spawn_sync.cc
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -721,18 +721,18 @@ Local<Array> SyncProcessRunner::BuildOutputArray() {
721721
CHECK(!stdio_pipes_.empty());
722722

723723
EscapableHandleScope scope(env()->isolate());
724-
Local<Context> context = env()->context();
725-
Local<Array> js_output = Array::New(env()->isolate(), stdio_count_);
724+
MaybeStackBuffer<Local<Value>, 8> js_output(stdio_pipes_.size());
726725

727726
for (uint32_t i = 0; i < stdio_pipes_.size(); i++) {
728727
SyncProcessStdioPipe* h = stdio_pipes_[i].get();
729728
if (h != nullptr && h->writable())
730-
js_output->Set(context, i, h->GetOutputAsBuffer(env())).Check();
729+
js_output[i] = h->GetOutputAsBuffer(env());
731730
else
732-
js_output->Set(context, i, Null(env()->isolate())).Check();
731+
js_output[i] = Null(env()->isolate());
733732
}
734733

735-
return scope.Escape(js_output);
734+
return scope.Escape(
735+
Array::New(env()->isolate(), js_output.out(), js_output.length()));
736736
}
737737

738738
Maybe<int> SyncProcessRunner::ParseOptions(Local<Value> js_value) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.