[es7] refactor and fix Object.values() / Object.entries()

src/objects.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/objects.h"
 
 #include <cmath>
 #include <iomanip>
 #include <sstream>
 
@@ skipping 8903 matching lines @@
   Isolate* isolate = object->GetIsolate();
   KeyAccumulator accumulator(isolate, filter);
   MAYBE_RETURN(
       GetKeys_Internal(isolate, object, object, type, filter, &accumulator),
       MaybeHandle<FixedArray>());
   Handle<FixedArray> keys = accumulator.GetKeys(keys_conversion);
   DCHECK(ContainsOnlyValidKeys(keys));
   return keys;
 }
 
+MaybeHandle<FixedArray> JSReceiver::GetOwnValues(
+    Handle<JSReceiver> object, PropertyFilter filter,
+    GetKeysConversion keys_conversion) {
+  USE(ContainsOnlyValidKeys);

[Camillo Bruni, 2016/02/03 12:03:48]

Probably you wanted to add a DCHECK(ContainsOnlyValidKeys(keys)) at the end of
the method?

[caitp (gmail), 2016/02/03 12:57:30]

Not sure why I added this, copy/paste code? There is no FixedArray of keys to
validate in either method

+  Isolate* isolate = object->GetIsolate();
+  KeyAccumulator accumulator(isolate, filter);
+  MAYBE_RETURN(
+      GetKeys_Internal(isolate, object, object, OWN_ONLY, filter, &accumulator),
+      MaybeHandle<FixedArray>());
+  return accumulator.GetValues(object, keys_conversion);
+}
+
+MaybeHandle<FixedArray> JSReceiver::GetOwnEntries(
+    Handle<JSReceiver> object, PropertyFilter filter,
+    GetKeysConversion keys_conversion) {
+  USE(ContainsOnlyValidKeys);

[Camillo Bruni, 2016/02/03 12:03:49]

same here :)

+  Isolate* isolate = object->GetIsolate();
+  KeyAccumulator accumulator(isolate, filter);
+  MAYBE_RETURN(
+      GetKeys_Internal(isolate, object, object, OWN_ONLY, filter, &accumulator),
+      MaybeHandle<FixedArray>());
+  return accumulator.GetEntries(object, keys_conversion);
+}
 
 bool Map::DictionaryElementsInPrototypeChainOnly() {
   if (IsDictionaryElementsKind(elements_kind())) {
     return false;
   }
 
   for (PrototypeIterator iter(this); !iter.IsAtEnd(); iter.Advance()) {
     // Be conservative, don't walk into proxies.
     if (iter.GetCurrent()->IsJSProxy()) return true;
     // String wrappers have non-configurable, non-writable elements.
@@ skipping 10815 matching lines @@
   if (cell->value() != *new_value) {
     cell->set_value(*new_value);
     Isolate* isolate = cell->GetIsolate();
     cell->dependent_code()->DeoptimizeDependentCodeGroup(
         isolate, DependentCode::kPropertyCellChangedGroup);
   }
 }
 
 }  // namespace internal
 }  // namespace v8