commit e59ed15891d238ce3864f461622fe86f65652e31
author The Android Open Source Project <initial-contribution@android.com> Fri Nov 22 10:35:19 2013 -0800
committer The Android Open Source Project <initial-contribution@android.com> Fri Nov 22 10:35:19 2013 -0800
tree 9d9cb58b79213ae404acef5a7eb118c099e0cd5a
parent c532760504e991c735370db73387337df5354de0
parent f53dc205fc8ac4f3e92cb554eb15ef0588667a4b

Merge commit 'f53dc205fc8ac4f3e92cb554eb15ef0588667a4b' into HEAD

src/objects.cc

diff --git a/src/objects.cc b/src/objects.cc
index 904cf52..a30641b 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -10102,6 +10102,13 @@
     }
   }
 
+  if (IsJSGlobalProxy()) {
+    Object* proto = GetPrototype();
+    if (proto->IsNull()) return false;
+    ASSERT(proto->IsJSGlobalObject());
+    return JSObject::cast(proto)->HasRealElementProperty(index);
+  }
+
   // Handle [] on String objects.
   if (this->IsStringObjectWithCharacterAt(index)) return true;