Skip to content

Commit 7a51c98

Browse files
node-api: remove unnecessary branch
1 parent 3810e3b commit 7a51c98

File tree

2 files changed

+19
-23
lines changed

2 files changed

+19
-23
lines changed

src/js_native_api_v8.cc

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,29 +1609,22 @@ napi_create_object_with_properties(napi_env env,
16091609
v8::Local<v8::Value> v8_prototype_or_null =
16101610
v8impl::V8LocalValueFromJsValue(prototype_or_null);
16111611

1612-
v8::Local<v8::Object> obj;
1613-
1614-
if (property_count > 0) {
1615-
v8::LocalVector<v8::Name> v8_names(env->isolate, property_count);
1616-
v8::LocalVector<v8::Value> v8_values(env->isolate, property_count);
1612+
v8::LocalVector<v8::Name> v8_names(env->isolate, property_count);
1613+
v8::LocalVector<v8::Value> v8_values(env->isolate, property_count);
16171614

1618-
for (size_t i = 0; i < property_count; i++) {
1619-
v8::Local<v8::Value> name_value =
1620-
v8impl::V8LocalValueFromJsValue(property_names[i]);
1621-
RETURN_STATUS_IF_FALSE(env, name_value->IsName(), napi_name_expected);
1622-
v8_names[i] = name_value.As<v8::Name>();
1623-
v8_values[i] = v8impl::V8LocalValueFromJsValue(property_values[i]);
1624-
}
1625-
1626-
obj = v8::Object::New(env->isolate,
1627-
v8_prototype_or_null,
1628-
v8_names.data(),
1629-
v8_values.data(),
1630-
property_count);
1631-
} else {
1632-
obj = v8::Object::New(
1633-
env->isolate, v8_prototype_or_null, nullptr, nullptr, 0);
1634-
}
1615+
for (size_t i = 0; i < property_count; i++) {
1616+
v8::Local<v8::Value> name_value =
1617+
v8impl::V8LocalValueFromJsValue(property_names[i]);
1618+
RETURN_STATUS_IF_FALSE(env, name_value->IsName(), napi_name_expected);
1619+
v8_names[i] = name_value.As<v8::Name>();
1620+
v8_values[i] = v8impl::V8LocalValueFromJsValue(property_values[i]);
1621+
}
1622+
1623+
v8::Local<v8::Object> obj = v8::Object::New(env->isolate,
1624+
v8_prototype_or_null,
1625+
v8_names.data(),
1626+
v8_values.data(),
1627+
property_count);
16351628

16361629
RETURN_STATUS_IF_FALSE(env, !obj.IsEmpty(), napi_generic_failure);
16371630
*result = v8impl::JsValueFromV8LocalValue(obj);

test/js-native-api/test_object/binding.gyp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
"sources": [
66
"test_null.c",
77
"test_object.c"
8-
]
8+
],
9+
"defines": [
10+
"NAPI_EXPERIMENTAL"
11+
],
912
},
1013
{
1114
"target_name": "test_exceptions",

0 commit comments

Comments
 (0)