Reviewers: Jakob,

Description:
Version 3.19.18.4.

Merged r15254 into trunk branch.

Handle MONOMORPIC loads where type feedback is code stub

[email protected]

Please review this at https://codereview.chromium.org/17351011/

SVN Base: https://v8.googlecode.com/svn/trunk

Affected files:
  M src/type-info.cc
  M src/version.cc


Index: src/type-info.cc
diff --git a/src/type-info.cc b/src/type-info.cc
index c5bdc9bec9dc3f11bf86e878e17fa2589115af90..dee2a77d9e8fdbff391b3e395cf35f5d260f9e70 100644
--- a/src/type-info.cc
+++ b/src/type-info.cc
@@ -475,7 +475,8 @@ void TypeFeedbackOracle::CollectReceiverTypes(TypeFeedbackId ast_id,
     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) {
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 4d9567773233dad30005a8aa959e91aa377d6596..b9e8be5ae17fcfc02c64e4960cdab6b2dd1ca3dd 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -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