Merge isolates to 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 55 matching lines @@
   global_context_ = global_context;
   PopulateMap(code);
   ASSERT(reinterpret_cast<Address>(*dictionary_.location()) != kHandleZapValue);
 }
 
 
 Handle<Object> TypeFeedbackOracle::GetInfo(int pos) {
   int entry = dictionary_->FindEntry(pos);
   return entry != NumberDictionary::kNotFound
       ? Handle<Object>(dictionary_->ValueAt(entry))
-      : Factory::undefined_value();
+      : Isolate::Current()->factory()->undefined_value();
 }
 
 
 bool TypeFeedbackOracle::LoadIsMonomorphic(Property* 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_LOAD_IC &&
         code->FindFirstMap() != NULL;
@@ skipping 113 matching lines @@
     case BOOLEAN_CHECK:
       function = global_context_->boolean_function();
       break;
   }
   ASSERT(function != NULL);
   return Handle<JSObject>(JSObject::cast(function->instance_prototype()));
 }
 
 
 bool TypeFeedbackOracle::LoadIsBuiltin(Property* expr, Builtins::Name id) {
-  return *GetInfo(expr->position()) == Builtins::builtin(id);
+  return *GetInfo(expr->position()) ==
+      Isolate::Current()->builtins()->builtin(id);
 }
 
 
 TypeInfo TypeFeedbackOracle::CompareType(CompareOperation* expr) {
   Handle<Object> object = GetInfo(expr->position());
   TypeInfo unknown = TypeInfo::Unknown();
   if (!object->IsCode()) return unknown;
   Handle<Code> code = Handle<Code>::cast(object);
   if (!code->is_compare_ic_stub()) return unknown;
 
@@ skipping 102 matching lines @@
     case CompareIC::GENERIC:
     default:
       return unknown;
   }
 }
 
 
 ZoneMapList* TypeFeedbackOracle::CollectReceiverTypes(int position,
                                                       Handle<String> name,
                                                       Code::Flags flags) {
+  Isolate* isolate = Isolate::Current();
   Handle<Object> object = GetInfo(position);
   if (object->IsUndefined() || object->IsSmi()) return NULL;
 
-  if (*object == Builtins::builtin(Builtins::StoreIC_GlobalProxy)) {
+  if (*object == isolate->builtins()->builtin(Builtins::StoreIC_GlobalProxy)) {
     // TODO(fschneider): We could collect the maps and signal that
     // we need a generic store (or load) here.
     ASSERT(Handle<Code>::cast(object)->ic_state() == MEGAMORPHIC);
     return NULL;
   } else if (object->IsMap()) {
     ZoneMapList* types = new ZoneMapList(1);
     types->Add(Handle<Map>::cast(object));
     return types;
   } else if (Handle<Code>::cast(object)->ic_state() == MEGAMORPHIC) {
     ZoneMapList* types = new ZoneMapList(4);
     ASSERT(object->IsCode());
-    StubCache::CollectMatchingMaps(types, *name, flags);
+    isolate->stub_cache()->CollectMatchingMaps(types, *name, flags);
     return types->length() > 0 ? types : NULL;
   } else {
     return NULL;
   }
 }
 
 
 void TypeFeedbackOracle::PopulateMap(Handle<Code> code) {
-  HandleScope scope;
+  Isolate* isolate = Isolate::Current();
+  HandleScope scope(isolate);
 
   const int kInitialCapacity = 16;
   List<int> code_positions(kInitialCapacity);
   List<int> source_positions(kInitialCapacity);
   CollectPositions(*code, &code_positions, &source_positions);
 
   ASSERT(dictionary_.is_null());  // Only initialize once.
-  dictionary_ = Factory::NewNumberDictionary(code_positions.length());
+  dictionary_ = isolate->factory()->NewNumberDictionary(
+      code_positions.length());
 
   int length = code_positions.length();
   ASSERT(source_positions.length() == length);
   for (int i = 0; i < length; i++) {
-    HandleScope loop_scope;
+    HandleScope loop_scope(isolate);
     RelocInfo info(code->instruction_start() + code_positions[i],
                    RelocInfo::CODE_TARGET, 0);
     Handle<Code> target(Code::GetCodeFromTargetAddress(info.target_address()));
     int position = source_positions[i];
     InlineCacheState state = target->ic_state();
     Code::Kind kind = target->kind();
     Handle<Object> value;
     if (kind == Code::BINARY_OP_IC ||
         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 (kind == Code::KEYED_EXTERNAL_ARRAY_LOAD_IC ||
           kind == Code::KEYED_EXTERNAL_ARRAY_STORE_IC) {
         value = target;
-      } else if (kind != Code::CALL_IC ||
-                 target->check_type() == RECEIVER_MAP_CHECK) {
-        Handle<Map> map = Handle<Map>(target->FindFirstMap());
-        if (*map == NULL) {
+      } else if (target->kind() != Code::CALL_IC ||
+          target->check_type() == RECEIVER_MAP_CHECK) {
+        Map* map = target->FindFirstMap();
+        if (map == NULL) {
           value = target;
         } else {
-          value = map;
+          value = Handle<Map>(map);
         }
       } else {
         ASSERT(target->kind() == Code::CALL_IC);
         CheckType check = target->check_type();
         ASSERT(check != RECEIVER_MAP_CHECK);
         value = Handle<Object>(Smi::FromInt(check));
       }
     } else if (state == MEGAMORPHIC) {
       value = target;
     }
 
     if (!value.is_null()) {
       Handle<NumberDictionary> new_dict =
-          Factory::DictionaryAtNumberPut(dictionary_, position, value);
+          isolate->factory()->DictionaryAtNumberPut(
+              dictionary_, position, value);
       dictionary_ = loop_scope.CloseAndEscape(new_dict);
     }
   }
   // Allocate handle in the parent scope.
   dictionary_ = scope.CloseAndEscape(dictionary_);
 }
 
 
 void TypeFeedbackOracle::CollectPositions(Code* code,
                                           List<int>* code_positions,
@@ skipping 30 matching lines @@
         source_positions->Add(position);
       }
     } else {
       ASSERT(RelocInfo::IsPosition(mode));
       position = static_cast<int>(info->data());
     }
   }
 }
 
 } }  // namespace v8::internal