Revision: 12280
Author: [email protected]
Date: Wed Aug 8 09:51:32 2012
Log: Minimal backport of the most important parts of r12271
to fix 140473.
Review URL: https://chromiumcodereview.appspot.com/10834231
http://code.google.com/p/v8/source/detail?r=12280
Modified:
/branches/3.11/src/hydrogen-instructions.cc
/branches/3.11/src/version.cc
=======================================
--- /branches/3.11/src/hydrogen-instructions.cc Wed Jun 13 04:51:58 2012
+++ /branches/3.11/src/hydrogen-instructions.cc Wed Aug 8 09:51:32 2012
@@ -1631,6 +1631,7 @@
if (current->IsJSGlobalProxy() ||
current->IsGlobalObject() ||
!current->IsJSObject() ||
+ JSObject::cast(current)->map()->has_named_interceptor() ||
JSObject::cast(current)->IsAccessCheckNeeded() ||
!JSObject::cast(current)->HasFastProperties()) {
return false;
@@ -1685,7 +1686,8 @@
types_.Add(types->at(i), zone);
break;
case MAP_TRANSITION:
- if (PrototypeChainCanNeverResolve(map, name)) {
+ if (!map->has_named_interceptor() &&
+ PrototypeChainCanNeverResolve(map, name)) {
negative_lookups.Add(types->at(i), zone);
}
break;
@@ -1693,7 +1695,8 @@
break;
}
} else if (lookup.IsCacheable()) {
- if (PrototypeChainCanNeverResolve(map, name)) {
+ if (!map->has_named_interceptor() &&
+ PrototypeChainCanNeverResolve(map, name)) {
negative_lookups.Add(types->at(i), zone);
}
}
=======================================
--- /branches/3.11/src/version.cc Fri Jul 20 04:03:23 2012
+++ /branches/3.11/src/version.cc Wed Aug 8 09:51:32 2012
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 11
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 17
+#define PATCH_LEVEL 18
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
