[Isolates] Moved more compilation-related globals (builtins, runtime, &c.)...

src/ic.cc

 // Copyright 2006-2009 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 261 matching lines @@
 
 void KeyedStoreIC::Clear(Address address, Code* target) {
   if (target->ic_state() == UNINITIALIZED) return;
   SetTargetAtAddress(address, initialize_stub());
 }
 
 
 Code* KeyedLoadIC::external_array_stub(JSObject::ElementsKind elements_kind) {
   switch (elements_kind) {
     case JSObject::EXTERNAL_BYTE_ELEMENTS:
-      return Builtins::builtin(Builtins::KeyedLoadIC_ExternalByteArray);
+      return Isolate::Current()->builtins()->builtin(
+          Builtins::KeyedLoadIC_ExternalByteArray);
     case JSObject::EXTERNAL_UNSIGNED_BYTE_ELEMENTS:
-      return Builtins::builtin(Builtins::KeyedLoadIC_ExternalUnsignedByteArray);
+      return Isolate::Current()->builtins()->builtin(
+          Builtins::KeyedLoadIC_ExternalUnsignedByteArray);
     case JSObject::EXTERNAL_SHORT_ELEMENTS:
-      return Builtins::builtin(Builtins::KeyedLoadIC_ExternalShortArray);
+      return Isolate::Current()->builtins()->builtin(
+          Builtins::KeyedLoadIC_ExternalShortArray);
     case JSObject::EXTERNAL_UNSIGNED_SHORT_ELEMENTS:
-      return Builtins::builtin(
+      return Isolate::Current()->builtins()->builtin(
           Builtins::KeyedLoadIC_ExternalUnsignedShortArray);
     case JSObject::EXTERNAL_INT_ELEMENTS:
-      return Builtins::builtin(Builtins::KeyedLoadIC_ExternalIntArray);
+      return Isolate::Current()->builtins()->builtin(
+          Builtins::KeyedLoadIC_ExternalIntArray);
     case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS:
-      return Builtins::builtin(Builtins::KeyedLoadIC_ExternalUnsignedIntArray);
+      return Isolate::Current()->builtins()->builtin(
+          Builtins::KeyedLoadIC_ExternalUnsignedIntArray);
     case JSObject::EXTERNAL_FLOAT_ELEMENTS:
-      return Builtins::builtin(Builtins::KeyedLoadIC_ExternalFloatArray);
+      return Isolate::Current()->builtins()->builtin(
+          Builtins::KeyedLoadIC_ExternalFloatArray);
     default:
       UNREACHABLE();
       return NULL;
   }
 }
 
 
 Code* KeyedStoreIC::external_array_stub(JSObject::ElementsKind elements_kind) {
   switch (elements_kind) {
     case JSObject::EXTERNAL_BYTE_ELEMENTS:
-      return Builtins::builtin(Builtins::KeyedStoreIC_ExternalByteArray);
+      return Isolate::Current()->builtins()->builtin(
+          Builtins::KeyedStoreIC_ExternalByteArray);
     case JSObject::EXTERNAL_UNSIGNED_BYTE_ELEMENTS:
-      return Builtins::builtin(
+      return Isolate::Current()->builtins()->builtin(
           Builtins::KeyedStoreIC_ExternalUnsignedByteArray);
     case JSObject::EXTERNAL_SHORT_ELEMENTS:
-      return Builtins::builtin(Builtins::KeyedStoreIC_ExternalShortArray);
+      return Isolate::Current()->builtins()->builtin(
+          Builtins::KeyedStoreIC_ExternalShortArray);
     case JSObject::EXTERNAL_UNSIGNED_SHORT_ELEMENTS:
-      return Builtins::builtin(
+      return Isolate::Current()->builtins()->builtin(
           Builtins::KeyedStoreIC_ExternalUnsignedShortArray);
     case JSObject::EXTERNAL_INT_ELEMENTS:
-      return Builtins::builtin(Builtins::KeyedStoreIC_ExternalIntArray);
+      return Isolate::Current()->builtins()->builtin(
+          Builtins::KeyedStoreIC_ExternalIntArray);
     case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS:
-      return Builtins::builtin(Builtins::KeyedStoreIC_ExternalUnsignedIntArray);
+      return Isolate::Current()->builtins()->builtin(
+          Builtins::KeyedStoreIC_ExternalUnsignedIntArray);
     case JSObject::EXTERNAL_FLOAT_ELEMENTS:
-      return Builtins::builtin(Builtins::KeyedStoreIC_ExternalFloatArray);
+      return Isolate::Current()->builtins()->builtin(
+          Builtins::KeyedStoreIC_ExternalFloatArray);
     default:
       UNREACHABLE();
       return NULL;
   }
 }
 
 
 static bool HasInterceptorGetter(JSObject* object) {
   return !object->GetNamedInterceptor()->getter()->IsUndefined();
 }
@@ skipping 339 matching lines @@
 #ifdef DEBUG
       if (FLAG_trace_ic) PrintF("[LoadIC : +#length /string]\n");
 #endif
       Map* map = HeapObject::cast(*object)->map();
       if (object->IsString()) {
         const int offset = String::kLengthOffset;
         PatchInlinedLoad(address(), map, offset);
       }
 
       Code* target = NULL;
-      target = Builtins::builtin(Builtins::LoadIC_StringLength);
+      target = Isolate::Current()->builtins()->builtin(
+          Builtins::LoadIC_StringLength);
       set_target(target);
       return Smi::FromInt(String::cast(*object)->length());
     }
 
     // Use specialized code for getting the length of arrays.
     if (object->IsJSArray() && name->Equals(HEAP->length_symbol())) {
 #ifdef DEBUG
       if (FLAG_trace_ic) PrintF("[LoadIC : +#length /array]\n");
 #endif
       Map* map = HeapObject::cast(*object)->map();
       const int offset = JSArray::kLengthOffset;
       PatchInlinedLoad(address(), map, offset);
 
-      Code* target = Builtins::builtin(Builtins::LoadIC_ArrayLength);
+      Code* target = Isolate::Current()->builtins()->builtin(
+          Builtins::LoadIC_ArrayLength);
       set_target(target);
       return JSArray::cast(*object)->length();
     }
 
     // Use specialized code for getting prototype of functions.
     if (object->IsJSFunction() && name->Equals(HEAP->prototype_symbol()) &&
         JSFunction::cast(*object)->should_have_prototype()) {
 #ifdef DEBUG
       if (FLAG_trace_ic) PrintF("[LoadIC : +#prototype /function]\n");
 #endif
-      Code* target = Builtins::builtin(Builtins::LoadIC_FunctionPrototype);
+      Code* target = Isolate::Current()->builtins()->builtin(
+          Builtins::LoadIC_FunctionPrototype);
       set_target(target);
       return Accessors::FunctionGetPrototype(*object, 0);
     }
   }
 
   // Check if the name is trivially convertible to an index and get
   // the element if so.
   uint32_t index;
   if (name->AsArrayIndex(&index)) return object->GetElement(index);
 
@@ skipping 441 matching lines @@
     return *value;
   }
 
   // Use specialized code for setting the length of arrays.
   if (receiver->IsJSArray()
       && name->Equals(HEAP->length_symbol())
       && receiver->AllowsSetElementsLength()) {
 #ifdef DEBUG
     if (FLAG_trace_ic) PrintF("[StoreIC : +#length /array]\n");
 #endif
-    Code* target = Builtins::builtin(Builtins::StoreIC_ArrayLength);
+    Code* target = Isolate::Current()->builtins()->builtin(
+        Builtins::StoreIC_ArrayLength);
     set_target(target);
     return receiver->SetProperty(*name, *value, NONE);
   }
 
   // Lookup the property locally in the receiver.
   if (FLAG_use_ic && !receiver->IsJSGlobalProxy()) {
     LookupResult lookup;
     if (LookupForWrite(*receiver, *name, &lookup)) {
       UpdateCaches(&lookup, state, receiver, name, value);
     }
@@ skipping 478 matching lines @@
 #undef ADDR
 };
 
 
 Address IC::AddressFromUtilityId(IC::UtilityId id) {
   return IC_utilities[id];
 }
 
 
 } }  // namespace v8::internal