Revision: 15255
Author:   [email protected]
Date:     Thu Jun 20 09:56:08 2013
Log:      Version 3.19.18.4.

Merged r15254 into trunk branch.

Handle MONOMORPIC loads where type feedback is code stub

[email protected]

Review URL: https://codereview.chromium.org/17351011
http://code.google.com/p/v8/source/detail?r=15255

Modified:
 /trunk/src/type-info.cc
 /trunk/src/version.cc

=======================================
--- /trunk/src/type-info.cc     Tue Jun 18 04:54:54 2013
+++ /trunk/src/type-info.cc     Thu Jun 20 09:56:08 2013
@@ -475,7 +475,8 @@
     ASSERT(Handle<Code>::cast(object)->ic_state() == GENERIC);
   } else if (object->IsMap()) {
     types->AddMapIfMissing(Handle<Map>::cast(object), zone());
-  } else if (Handle<Code>::cast(object)->ic_state() == POLYMORPHIC) {
+  } else if (Handle<Code>::cast(object)->ic_state() == POLYMORPHIC ||
+             Handle<Code>::cast(object)->ic_state() == MONOMORPHIC) {
     CollectPolymorphicMaps(Handle<Code>::cast(object), types);
   } else if (FLAG_collect_megamorphic_maps_from_stub_cache &&
       Handle<Code>::cast(object)->ic_state() == MEGAMORPHIC) {
=======================================
--- /trunk/src/version.cc       Thu Jun 20 09:20:19 2013
+++ /trunk/src/version.cc       Thu Jun 20 09:56:08 2013
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     19
 #define BUILD_NUMBER      18
-#define PATCH_LEVEL       3
+#define PATCH_LEVEL       4
 // 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
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to