Better support for 'polymorphic' JS and external arrays

src/type-info.cc

Index: src/type-info.cc
diff --git a/src/type-info.cc b/src/type-info.cc
index 1940601c4782dd157d8cb773c3de71aae7034fb2..d69026c7529d99db596f249f61d570c4249b5274 100644
--- a/src/type-info.cc
+++ b/src/type-info.cc
@@ -82,8 +82,8 @@ bool TypeFeedbackOracle::LoadIsMonomorphic(Property* expr) {
   if (map_or_code->IsMap()) return true;
   if (map_or_code->IsCode()) {
     Handle<Code> code(Code::cast(*map_or_code));
-    return code->kind() == Code::KEYED_EXTERNAL_ARRAY_LOAD_IC &&
-        code->FindFirstMap() != NULL;
+    return code->is_keyed_load_stub() &&
+        code->ic_state() == MONOMORPHIC;
   }
   return false;
 }
@@ -94,8 +94,8 @@ bool TypeFeedbackOracle::StoreIsMonomorphic(Expression* expr) {
   if (map_or_code->IsMap()) return true;
   if (map_or_code->IsCode()) {
     Handle<Code> code(Code::cast(*map_or_code));
-    return code->kind() == Code::KEYED_EXTERNAL_ARRAY_STORE_IC &&
-        code->FindFirstMap() != NULL;
+    return code->is_keyed_store_stub() &&
+        code->ic_state() == MONOMORPHIC;
   }
   return false;
 }
@@ -388,8 +388,8 @@ void TypeFeedbackOracle::PopulateMap(Handle<Code> code) {
         SetInfo(position, target);
       }
     } else if (state == MONOMORPHIC) {
-      if (kind == Code::KEYED_EXTERNAL_ARRAY_LOAD_IC ||
-          kind == Code::KEYED_EXTERNAL_ARRAY_STORE_IC) {
+      if (kind == Code::KEYED_LOAD_IC ||
+          kind == Code::KEYED_STORE_IC) {
         SetInfo(position, target);
       } else if (target->kind() != Code::CALL_IC ||
           target->check_type() == RECEIVER_MAP_CHECK) {