Skip to content

Commit 9ad61e6

Browse files
verwaestCommit bot
authored andcommitted
[builtins] Speedup Object.keys by adding a fast path for objects without elements, interceptors, ...
This speeds up the for-of-object benchmark at http://kpdecker.github.io/six-speed/ by >2x. BUG= Review URL: https://codereview.chromium.org/1682873003 Cr-Commit-Position: refs/heads/master@{#33867}
1 parent 4f62af4 commit 9ad61e6

2 files changed

Lines changed: 31 additions & 6 deletions

File tree

src/builtins.cc

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,13 +1766,37 @@ BUILTIN(ObjectKeys) {
17661766
Handle<JSReceiver> receiver;
17671767
ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, receiver,
17681768
Object::ToObject(isolate, object));
1769+
17691770
Handle<FixedArray> keys;
1770-
ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
1771-
isolate, keys, JSReceiver::GetKeys(receiver, OWN_ONLY, ENUMERABLE_STRINGS,
1772-
CONVERT_TO_STRING));
1773-
return *isolate->factory()->NewJSArrayWithElements(keys);
1774-
}
1771+
int enum_length = receiver->map()->EnumLength();
1772+
if (enum_length != kInvalidEnumCacheSentinel) {
1773+
DCHECK(receiver->IsJSObject());
1774+
Handle<JSObject> js_object = Handle<JSObject>::cast(receiver);
1775+
DCHECK(!js_object->HasNamedInterceptor());
1776+
DCHECK(!js_object->IsAccessCheckNeeded());
1777+
DCHECK(!js_object->map()->has_hidden_prototype());
1778+
DCHECK(js_object->HasFastProperties());
1779+
if (js_object->elements() == isolate->heap()->empty_fixed_array()) {
1780+
keys = isolate->factory()->NewFixedArray(enum_length);
1781+
if (enum_length != 0) {
1782+
Handle<FixedArray> cache(
1783+
js_object->map()->instance_descriptors()->GetEnumCache());
1784+
keys = isolate->factory()->NewFixedArray(enum_length);
1785+
for (int i = 0; i < enum_length; i++) {
1786+
keys->set(i, cache->get(i));
1787+
}
1788+
}
1789+
}
1790+
}
17751791

1792+
if (keys.is_null()) {
1793+
ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
1794+
isolate, keys,
1795+
JSReceiver::GetKeys(receiver, OWN_ONLY, ENUMERABLE_STRINGS,
1796+
CONVERT_TO_STRING));
1797+
}
1798+
return *isolate->factory()->NewJSArrayWithElements(keys, FAST_ELEMENTS);
1799+
}
17761800

17771801
BUILTIN(ObjectValues) {
17781802
HandleScope scope(isolate);

src/objects.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8742,7 +8742,8 @@ static Maybe<bool> GetKeysFromJSObject(Isolate* isolate,
87428742
bool cache_enum_length =
87438743
((object->map()->GetConstructor() != *arguments_function) &&
87448744
!object->IsJSValue() && !object->IsAccessCheckNeeded() &&
8745-
!object->HasNamedInterceptor() && !object->HasIndexedInterceptor());
8745+
!object->HasNamedInterceptor() && !object->HasIndexedInterceptor() &&
8746+
!object->map()->has_hidden_prototype());
87468747
// Compute the property keys and cache them if possible.
87478748
Handle<FixedArray> enum_keys =
87488749
JSObject::GetEnumPropertyKeys(object, cache_enum_length);

0 commit comments

Comments
 (0)