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

src/builtins.cc

 // Copyright 2012 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/builtins.h"
 
 #include "src/api.h"
 #include "src/api-natives.h"
 #include "src/arguments.h"
 #include "src/base/once.h"
@@ skipping 1735 matching lines @@
   return *isolate->factory()->NewJSArrayWithElements(keys);
 }
 
 
 BUILTIN(ObjectValues) {
   HandleScope scope(isolate);
   Handle<Object> object = args.atOrUndefined(isolate, 1);
   Handle<JSReceiver> receiver;
   ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, receiver,
                                      Object::ToObject(isolate, object));
-  Handle<FixedArray> values;
+  Handle<FixedArray> keys;
   ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
-      isolate, values, JSReceiver::GetOwnValues(receiver, ENUMERABLE_STRINGS));
-  return *isolate->factory()->NewJSArrayWithElements(values);
+      isolate, keys, JSReceiver::GetKeys(receiver, OWN_ONLY, ENUMERABLE_STRINGS,
+                                         CONVERT_TO_STRING));
+
+  for (int i = 0; i < keys->length(); ++i) {
+    auto key = Handle<Name>::cast(FixedArray::get(*keys, i, isolate));
+    Handle<Object> value;
+
+    ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
+        isolate, value, Object::GetPropertyOrElement(receiver, key, STRICT));
+
+    keys->set(i, *value);
+  }
+
+  return *isolate->factory()->NewJSArrayWithElements(keys);
 }
 
 
 BUILTIN(ObjectEntries) {
   HandleScope scope(isolate);
   Handle<Object> object = args.atOrUndefined(isolate, 1);
   Handle<JSReceiver> receiver;
   ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, receiver,
                                      Object::ToObject(isolate, object));
-  Handle<FixedArray> entries;
+  Handle<FixedArray> keys;
   ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
-      isolate, entries,
-      JSReceiver::GetOwnEntries(receiver, ENUMERABLE_STRINGS));
-  return *isolate->factory()->NewJSArrayWithElements(entries);
+      isolate, keys, JSReceiver::GetKeys(receiver, OWN_ONLY, ENUMERABLE_STRINGS,
+                                         CONVERT_TO_STRING));
+
+  for (int i = 0; i < keys->length(); ++i) {
+    auto key = Handle<Name>::cast(FixedArray::get(*keys, i, isolate));
+    Handle<Object> value;
+
+    ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
+        isolate, value, Object::GetPropertyOrElement(receiver, key, STRICT));
+
+    auto entry_storage = isolate->factory()->NewUninitializedFixedArray(2);
+    entry_storage->set(0, *key);
+    entry_storage->set(1, *value);
+    auto entry = isolate->factory()->NewJSArrayWithElements(entry_storage);
+    keys->set(i, *entry);
+  }
+
+  return *isolate->factory()->NewJSArrayWithElements(keys);
 }
 
 
 // ES6 section 19.1.2.15 Object.preventExtensions ( O )
 BUILTIN(ObjectPreventExtensions) {
   HandleScope scope(isolate);
   Handle<Object> object = args.atOrUndefined(isolate, 1);
   if (object->IsJSReceiver()) {
     MAYBE_RETURN(JSReceiver::PreventExtensions(Handle<JSReceiver>::cast(object),
                                                Object::THROW_ON_ERROR),
@@ skipping 2374 matching lines @@
 BUILTIN_LIST_C(DEFINE_BUILTIN_ACCESSOR_C)
 BUILTIN_LIST_A(DEFINE_BUILTIN_ACCESSOR_A)
 BUILTIN_LIST_H(DEFINE_BUILTIN_ACCESSOR_H)
 BUILTIN_LIST_DEBUG_A(DEFINE_BUILTIN_ACCESSOR_A)
 #undef DEFINE_BUILTIN_ACCESSOR_C
 #undef DEFINE_BUILTIN_ACCESSOR_A
 
 
 }  // namespace internal
 }  // namespace v8