commit 7d3e7fc4b65010eabe860313ee0c64f50843f6e3
author Ben Murdoch <benm@google.com> Tue Jul 12 16:37:06 2011 +0100
committer Ben Murdoch <benm@google.com> Wed Jul 13 11:00:43 2011 +0100
tree 1cf559005d8e87c1c1d2c4d1af29fecc9fd0b08c
parent d85c14422ed4297762a73b74af12e7957a63cb74

Merge V8 at branches/3.2 r8606: Initial merge by Git.

Change-Id: I9906d4a1145c7fab2ad78e7a9c375205c56d1287

src/objects.cc

diff --git a/src/objects.cc b/src/objects.cc
index a20548c..8491d58 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -1813,13 +1813,9 @@
        pt = pt->GetPrototype()) {
     JSObject::cast(pt)->LocalLookupRealNamedProperty(name, result);
     if (result->IsProperty()) {
-      if (result->IsReadOnly()) {
-        result->NotFound();
-        return;
-      }
-      if (result->type() == CALLBACKS) {
-        return;
-      }
+      if (result->type() == CALLBACKS && !result->IsReadOnly()) return;
+      // Found non-callback or read-only callback, stop looking.
+      break;
     }
   }
   result->NotFound();
@@ -3745,6 +3741,8 @@
         }
       }
       if (!map_done) continue;
+    } else {
+      map_or_index_field = NULL;
     }
     // That was the regular transitions, now for the prototype transitions.
     FixedArray* prototype_transitions =