Revision: 11810
Author: [email protected]
Date: Thu Jun 14 02:26:57 2012
Log: Merged r11807 into trunk branch.
Fix Kraken regression due to optimistic monomorphic element transitions
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10537172
http://code.google.com/p/v8/source/detail?r=11810
Modified:
/trunk/src/ic.cc
/trunk/src/version.cc
=======================================
--- /trunk/src/ic.cc Wed Jun 13 04:51:58 2012
+++ /trunk/src/ic.cc Thu Jun 14 02:26:57 2012
@@ -1602,7 +1602,7 @@
monomorphic = true;
} else {
GetReceiverMapsForStub(Handle<Code>(target()), &target_receiver_maps);
- if (ic_state == MONOMORPHIC && is_transition_stub) {
+ if (ic_state == MONOMORPHIC && (is_transition_stub || stub_kind ==
LOAD)) {
// The first time a receiver is seen that is a transitioned version
of the
// previous monomorphic receiver type, assume the new ElementsKind
is the
// monomorphic type. This benefits global arrays that only transition
=======================================
--- /trunk/src/version.cc Wed Jun 13 04:51:58 2012
+++ /trunk/src/version.cc Thu Jun 14 02:26:57 2012
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 11
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// 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
