Merge upstream V8 change to fix HasRealIndexedProperty.android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-dev

Bug: 9720511
Change-Id: I731b49b1bfbeeb9927fb995342f9e7454ce834dc

1 files changed, 7 insertions, 0 deletions

diff --git a/src/objects.cc b/src/objects.cc
index 904cf524..a30641b9 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -10102,6 +10102,13 @@ bool JSObject::HasRealElementProperty(uint32_t index) {
     }
   }
 
+  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;