Merge isolates to bleeding_edge.

src/frame-element.h

 // Copyright 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 88 matching lines @@
 
   // Factory function to construct a frame element whose value is known at
   // compile time.
   static FrameElement ConstantElement(Handle<Object> value,
                                       SyncFlag is_synced) {
     TypeInfo info = TypeInfo::TypeFromValue(value);
     FrameElement result(value, is_synced, info);
     return result;
   }
 
-  // Static indirection table for handles to constants.  If a frame
-  // element represents a constant, the data contains an index into
-  // this table of handles to the actual constants.
-  typedef ZoneList<Handle<Object> > ZoneObjectList;
-
-  static ZoneObjectList* ConstantList();
-
   static bool ConstantPoolOverflowed() {
-    return !DataField::is_valid(ConstantList()->length());
-  }
-
-  // Clear the constants indirection table.
-  static void ClearConstantList() {
-    ConstantList()->Clear();
+    return !DataField::is_valid(
+        Isolate::Current()->frame_element_constant_list()->length());
   }
 
   bool is_synced() const { return SyncedField::decode(value_); }
 
   void set_sync() {
     ASSERT(type() != MEMORY);
     value_ = value_ | SyncedField::encode(true);
   }
 
   void clear_sync() {
@@ skipping 24 matching lines @@
   Register reg() const {
     ASSERT(is_register());
     uint32_t reg = DataField::decode(value_);
     Register result;
     result.code_ = reg;
     return result;
   }
 
   Handle<Object> handle() const {
     ASSERT(is_constant());
-    return ConstantList()->at(DataField::decode(value_));
+    return Isolate::Current()->frame_element_constant_list()->
+        at(DataField::decode(value_));
   }
 
   int index() const {
     ASSERT(is_copy());
     return DataField::decode(value_);
   }
 
   bool Equals(FrameElement other) {
     uint32_t masked_difference = (value_ ^ other.value_) & ~CopiedField::mask();
     if (!masked_difference) {
@@ skipping 47 matching lines @@
                TypeInfo info) {
     value_ = TypeField::encode(type)
         | CopiedField::encode(false)
         | SyncedField::encode(is_synced != NOT_SYNCED)
         | TypeInfoField::encode(info.ToInt())
         | DataField::encode(reg.code_ > 0 ? reg.code_ : 0);
   }
 
   // Used to construct constant elements.
   FrameElement(Handle<Object> value, SyncFlag is_synced, TypeInfo info) {
+    ZoneObjectList* constant_list =
+        Isolate::Current()->frame_element_constant_list();
     value_ = TypeField::encode(CONSTANT)
         | CopiedField::encode(false)
         | SyncedField::encode(is_synced != NOT_SYNCED)
         | TypeInfoField::encode(info.ToInt())
-        | DataField::encode(ConstantList()->length());
-    ConstantList()->Add(value);
+        | DataField::encode(constant_list->length());
+    constant_list->Add(value);
   }
 
   Type type() const { return TypeField::decode(value_); }
   void set_type(Type type) {
     value_ = value_ & ~TypeField::mask();
     value_ = value_ | TypeField::encode(type);
   }
 
   void set_index(int new_index) {
     ASSERT(is_copy());
@@ skipping 17 matching lines @@
   class UntaggedInt32Field: public BitField<bool, 5, 1> {};
   class TypeInfoField: public BitField<int, 6, 7> {};
   class DataField: public BitField<uint32_t, 13, 32 - 13> {};
 
   friend class VirtualFrame;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_FRAME_ELEMENT_H_