Merge isolates to bleeding_edge.

src/code-stubs.cc

 // Copyright 2006-2008 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 19 matching lines @@
 #include "bootstrapper.h"
 #include "code-stubs.h"
 #include "factory.h"
 #include "gdb-jit.h"
 #include "macro-assembler.h"
 
 namespace v8 {
 namespace internal {
 
 bool CodeStub::FindCodeInCache(Code** code_out) {
-  int index = Heap::code_stubs()->FindEntry(GetKey());
+  int index = HEAP->code_stubs()->FindEntry(GetKey());
   if (index != NumberDictionary::kNotFound) {
-    *code_out = Code::cast(Heap::code_stubs()->ValueAt(index));
+    *code_out = Code::cast(HEAP->code_stubs()->ValueAt(index));
     return true;
   }
   return false;
 }
 
 
 void CodeStub::GenerateCode(MacroAssembler* masm) {
   // Update the static counter each time a new code stub is generated.
-  Counters::code_stubs.Increment();
+  COUNTERS->code_stubs()->Increment();
 
   // Nested stubs are not allowed for leafs.
   AllowStubCallsScope allow_scope(masm, AllowsStubCalls());
 
   // Generate the code for the stub.
   masm->set_generating_stub(true);
   Generate(masm);
 }
 
 
 void CodeStub::RecordCodeGeneration(Code* code, MacroAssembler* masm) {
   code->set_major_key(MajorKey());
 
-  PROFILE(CodeCreateEvent(Logger::STUB_TAG, code, GetName()));
+  PROFILE(ISOLATE, CodeCreateEvent(Logger::STUB_TAG, code, GetName()));
   GDBJIT(AddCode(GDBJITInterface::STUB, GetName(), code));
-  Counters::total_stubs_code_size.Increment(code->instruction_size());
+  COUNTERS->total_stubs_code_size()->Increment(code->instruction_size());
 
 #ifdef ENABLE_DISASSEMBLER
   if (FLAG_print_code_stubs) {
 #ifdef DEBUG
     Print();
 #endif
     code->Disassemble(GetName());
     PrintF("\n");
   }
 #endif
@@ skipping 16 matching lines @@
 
     // Create the code object.
     CodeDesc desc;
     masm.GetCode(&desc);
 
     // Copy the generated code into a heap object.
     Code::Flags flags = Code::ComputeFlags(
         static_cast<Code::Kind>(GetCodeKind()),
         InLoop(),
         GetICState());
-    Handle<Code> new_object = Factory::NewCode(
+    Handle<Code> new_object = FACTORY->NewCode(
         desc, flags, masm.CodeObject(), NeedsImmovableCode());
     RecordCodeGeneration(*new_object, &masm);
     FinishCode(*new_object);
 
     // Update the dictionary and the root in Heap.
     Handle<NumberDictionary> dict =
-        Factory::DictionaryAtNumberPut(
-            Handle<NumberDictionary>(Heap::code_stubs()),
+        FACTORY->DictionaryAtNumberPut(
+            Handle<NumberDictionary>(HEAP->code_stubs()),
             GetKey(),
             new_object);
-    Heap::public_set_code_stubs(*dict);
+    HEAP->public_set_code_stubs(*dict);
 
     code = *new_object;
   }
 
-  ASSERT(!NeedsImmovableCode() || Heap::lo_space()->Contains(code));
+  ASSERT(!NeedsImmovableCode() || HEAP->lo_space()->Contains(code));
   return Handle<Code>(code);
 }
 
 
 MaybeObject* CodeStub::TryGetCode() {
   Code* code;
   if (!FindCodeInCache(&code)) {
     // Generate the new code.
     MacroAssembler masm(NULL, 256);
     GenerateCode(&masm);
 
     // Create the code object.
     CodeDesc desc;
     masm.GetCode(&desc);
 
     // Try to copy the generated code into a heap object.
     Code::Flags flags = Code::ComputeFlags(
         static_cast<Code::Kind>(GetCodeKind()),
         InLoop(),
         GetICState());
     Object* new_object;
     { MaybeObject* maybe_new_object =
-          Heap::CreateCode(desc, flags, masm.CodeObject());
+          HEAP->CreateCode(desc, flags, masm.CodeObject());
       if (!maybe_new_object->ToObject(&new_object)) return maybe_new_object;
     }
     code = Code::cast(new_object);
     RecordCodeGeneration(code, &masm);
     FinishCode(code);
 
     // Try to update the code cache but do not fail if unable.
     MaybeObject* maybe_new_object =
-        Heap::code_stubs()->AtNumberPut(GetKey(), code);
+        HEAP->code_stubs()->AtNumberPut(GetKey(), code);
     if (maybe_new_object->ToObject(&new_object)) {
-      Heap::public_set_code_stubs(NumberDictionary::cast(new_object));
+      HEAP->public_set_code_stubs(NumberDictionary::cast(new_object));
     }
   }
 
   return code;
 }
 
 
 const char* CodeStub::MajorName(CodeStub::Major major_key,
                                 bool allow_unknown_keys) {
   switch (major_key) {
@@ skipping 30 matching lines @@
       break;
     default:
       UNREACHABLE();
   }
 }
 
 
 const char* InstanceofStub::GetName() {
   if (name_ != NULL) return name_;
   const int kMaxNameLength = 100;
-  name_ = Bootstrapper::AllocateAutoDeletedArray(kMaxNameLength);
+  name_ = Isolate::Current()->bootstrapper()->AllocateAutoDeletedArray(
+      kMaxNameLength);
   if (name_ == NULL) return "OOM";
 
   const char* args = "";
   if (HasArgsInRegisters()) {
     args = "_REGS";
   }
 
   const char* inline_check = "";
   if (HasCallSiteInlineCheck()) {
     inline_check = "_INLINE";
   }
 
   const char* return_true_false_object = "";
   if (ReturnTrueFalseObject()) {
     return_true_false_object = "_TRUEFALSE";
   }
 
   OS::SNPrintF(Vector<char>(name_, kMaxNameLength),
                "InstanceofStub%s%s%s",
                args,
                inline_check,
                return_true_false_object);
   return name_;
 }
 
 
 } }  // namespace v8::internal