[Isolates] Merge (7083,7111] from bleeding_edge.

src/type-info.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 60 matching lines @@
 
 Handle<Object> TypeFeedbackOracle::GetInfo(int pos) {
   int entry = dictionary_->FindEntry(pos);
   return entry != NumberDictionary::kNotFound
       ? Handle<Object>(dictionary_->ValueAt(entry))
       : Isolate::Current()->factory()->undefined_value();
 }
 
 
 bool TypeFeedbackOracle::LoadIsMonomorphic(Property* expr) {
-  return GetInfo(expr->position())->IsMap();
+  Handle<Object> map_or_code(GetInfo(expr->position()));
+  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 false;
 }
 
 
-bool TypeFeedbackOracle:: StoreIsMonomorphic(Assignment* expr) {
-  return GetInfo(expr->position())->IsMap();
+bool TypeFeedbackOracle::StoreIsMonomorphic(Assignment* expr) {
+  Handle<Object> map_or_code(GetInfo(expr->position()));
+  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 false;
 }
 
 
 bool TypeFeedbackOracle::CallIsMonomorphic(Call* expr) {
   Handle<Object> value = GetInfo(expr->position());
   return value->IsMap() || value->IsSmi();
 }
 
 
 Handle<Map> TypeFeedbackOracle::LoadMonomorphicReceiverType(Property* expr) {
   ASSERT(LoadIsMonomorphic(expr));
-  return Handle<Map>::cast(GetInfo(expr->position()));
+  Handle<Object> map_or_code(
+      Handle<HeapObject>::cast(GetInfo(expr->position())));
+  if (map_or_code->IsCode()) {
+    Handle<Code> code(Code::cast(*map_or_code));
+    return Handle<Map>(code->FindFirstMap());
+  }
+  return Handle<Map>(Map::cast(*map_or_code));
 }
 
 
 Handle<Map> TypeFeedbackOracle::StoreMonomorphicReceiverType(Assignment* expr) {
   ASSERT(StoreIsMonomorphic(expr));
-  return Handle<Map>::cast(GetInfo(expr->position()));
+  Handle<HeapObject> map_or_code(
+      Handle<HeapObject>::cast(GetInfo(expr->position())));
+  if (map_or_code->IsCode()) {
+    Handle<Code> code(Code::cast(*map_or_code));
+    return Handle<Map>(code->FindFirstMap());
+  }
+  return Handle<Map>(Map::cast(*map_or_code));
 }
 
 
 ZoneMapList* TypeFeedbackOracle::LoadReceiverTypes(Property* expr,
                                                    Handle<String> name) {
   Code::Flags flags = Code::ComputeMonomorphicFlags(Code::LOAD_IC, NORMAL);
   return CollectReceiverTypes(expr->position(), name, flags);
 }
 
 
@@ skipping 22 matching lines @@
 
 
 CheckType TypeFeedbackOracle::GetCallCheckType(Call* expr) {
   Handle<Object> value = GetInfo(expr->position());
   if (!value->IsSmi()) return RECEIVER_MAP_CHECK;
   CheckType check = static_cast<CheckType>(Smi::cast(*value)->value());
   ASSERT(check != RECEIVER_MAP_CHECK);
   return check;
 }
 
+ExternalArrayType TypeFeedbackOracle::GetKeyedLoadExternalArrayType(
+    Property* expr) {
+  Handle<Object> stub = GetInfo(expr->position());
+  ASSERT(stub->IsCode());
+  return Code::cast(*stub)->external_array_type();
+}
+
+ExternalArrayType TypeFeedbackOracle::GetKeyedStoreExternalArrayType(
+    Assignment* expr) {
+  Handle<Object> stub = GetInfo(expr->position());
+  ASSERT(stub->IsCode());
+  return Code::cast(*stub)->external_array_type();
+}
 
 Handle<JSObject> TypeFeedbackOracle::GetPrototypeForPrimitiveCheck(
     CheckType check) {
   JSFunction* function = NULL;
   switch (check) {
     case RECEIVER_MAP_CHECK:
       UNREACHABLE();
       break;
     case STRING_CHECK:
       function = global_context_->string_function();
@@ skipping 187 matching lines @@
         kind == Code::TYPE_RECORDING_BINARY_OP_IC ||
         kind == Code::COMPARE_IC) {
       // TODO(kasperl): Avoid having multiple ICs with the same
       // position by making sure that we have position information
       // recorded for all binary ICs.
       int entry = dictionary_->FindEntry(position);
       if (entry == NumberDictionary::kNotFound) {
         value = target;
       }
     } else if (state == MONOMORPHIC) {
-      if (target->kind() != Code::CALL_IC ||
+      if (kind == Code::KEYED_EXTERNAL_ARRAY_LOAD_IC ||
+          kind == Code::KEYED_EXTERNAL_ARRAY_STORE_IC) {
+        value = target;
+      } else if (target->kind() != Code::CALL_IC ||
           target->check_type() == RECEIVER_MAP_CHECK) {
         Map* map = target->FindFirstMap();
         if (map == NULL) {
           value = target;
         } else {
           value = Handle<Map>(map);
         }
       } else {
         ASSERT(target->kind() == Code::CALL_IC);
         CheckType check = target->check_type();
@@ skipping 51 matching lines @@
         source_positions->Add(position);
       }
     } else {
       ASSERT(RelocInfo::IsPosition(mode));
       position = static_cast<int>(info->data());
     }
   }
 }
 
 } }  // namespace v8::internal