Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/src/key-accumulator.cc b/src/key-accumulator.cc
index e7a9c3c..c2c4996 100644
--- a/src/key-accumulator.cc
+++ b/src/key-accumulator.cc
@@ -29,6 +29,9 @@
// Make sure we have all the lengths collected.
NextPrototype();
+ if (type_ == OWN_ONLY && !ownProxyKeys_.is_null()) {
+ return ownProxyKeys_;
+ }
// Assemble the result array by first adding the element keys and then the
// property keys. We use the total number of String + Symbol keys per level in
// |level_lengths_| and the available element keys in the corresponding bucket
@@ -260,7 +263,13 @@
// Proxies define a complete list of keys with no distinction of
// elements and properties, which breaks the normal assumption for the
// KeyAccumulator.
- AddKeys(keys, PROXY_MAGIC);
+ if (type_ == OWN_ONLY) {
+ ownProxyKeys_ = keys;
+ level_string_length_ = keys->length();
+ length_ = level_string_length_;
+ } else {
+ AddKeys(keys, PROXY_MAGIC);
+ }
// Invert the current length to indicate a present proxy, so we can ignore
// element keys for this level. Otherwise we would not fully respect the order
// given by the proxy.