Index: src/builtins.cc |
diff --git a/src/builtins.cc b/src/builtins.cc |
index 7604397844b24571da34abe1fab61cd0fd6e64e6..61692d56a1912a4a784e7d2100d6a6ac87c5c08c 100644 |
--- a/src/builtins.cc |
+++ b/src/builtins.cc |
@@ -1628,8 +1628,9 @@ BUILTIN(ObjectAssign) { |
// 4b ii. Let keys be ? from.[[OwnPropertyKeys]](). |
Handle<FixedArray> keys; |
ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
- isolate, keys, |
- KeyAccumulator::GetKeys(from, OWN_ONLY, ALL_PROPERTIES, KEEP_NUMBERS)); |
+ isolate, keys, KeyAccumulator::GetKeys( |
+ from, KeyCollectionMode::kOwnOnly, ALL_PROPERTIES, |
+ GetKeysConversion::kKeepNumbers)); |
// 4c. Repeat for each element nextKey of keys in List order, |
for (int j = 0; j < keys->length(); ++j) { |
Handle<Object> next_key(keys->get(j), isolate); |
@@ -1902,7 +1903,8 @@ Object* GetOwnPropertyKeys(Isolate* isolate, |
Handle<FixedArray> keys; |
ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
isolate, keys, |
- KeyAccumulator::GetKeys(receiver, OWN_ONLY, filter, CONVERT_TO_STRING)); |
+ KeyAccumulator::GetKeys(receiver, KeyCollectionMode::kOwnOnly, filter, |
+ GetKeysConversion::kConvertToString)); |
return *isolate->factory()->NewJSArrayWithElements(keys); |
} |
@@ -1998,8 +2000,9 @@ BUILTIN(ObjectKeys) { |
} else { |
ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
isolate, keys, |
- KeyAccumulator::GetKeys(receiver, OWN_ONLY, ENUMERABLE_STRINGS, |
- CONVERT_TO_STRING)); |
+ KeyAccumulator::GetKeys(receiver, KeyCollectionMode::kOwnOnly, |
+ ENUMERABLE_STRINGS, |
+ GetKeysConversion::kConvertToString)); |
} |
return *isolate->factory()->NewJSArrayWithElements(keys, FAST_ELEMENTS); |
} |
@@ -2041,8 +2044,9 @@ BUILTIN(ObjectGetOwnPropertyDescriptors) { |
Handle<FixedArray> keys; |
ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
- isolate, keys, KeyAccumulator::GetKeys(receiver, OWN_ONLY, ALL_PROPERTIES, |
- CONVERT_TO_STRING)); |
+ isolate, keys, KeyAccumulator::GetKeys( |
+ receiver, KeyCollectionMode::kOwnOnly, ALL_PROPERTIES, |
+ GetKeysConversion::kConvertToString)); |
Handle<JSObject> descriptors = |
isolate->factory()->NewJSObject(isolate->object_function()); |
@@ -2719,8 +2723,9 @@ BUILTIN(ReflectOwnKeys) { |
Handle<FixedArray> keys; |
ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
isolate, keys, |
- KeyAccumulator::GetKeys(Handle<JSReceiver>::cast(target), OWN_ONLY, |
- ALL_PROPERTIES, CONVERT_TO_STRING)); |
+ KeyAccumulator::GetKeys(Handle<JSReceiver>::cast(target), |
+ KeyCollectionMode::kOwnOnly, ALL_PROPERTIES, |
+ GetKeysConversion::kConvertToString)); |
return *isolate->factory()->NewJSArrayWithElements(keys); |
} |