Merge isolates to bleeding_edge.

src/scopeinfo.h

 // 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 96 matching lines @@
   static SerializedScopeInfo* cast(Object* object) {
     ASSERT(object->IsFixedArray());
     return reinterpret_cast<SerializedScopeInfo*>(object);
   }
 
   // Does this scope call eval?
   bool CallsEval();
 
   // Does this scope have an arguments shadow?
   bool HasArgumentsShadow() {
-    return StackSlotIndex(Heap::arguments_shadow_symbol()) >= 0;
+    return StackSlotIndex(GetHeap()->arguments_shadow_symbol()) >= 0;
   }
 
   // Return the number of stack slots for code.
   int NumberOfStackSlots();
 
   // Return the number of context slots for code.
   int NumberOfContextSlots();
 
   // Return if this has context slots besides MIN_CONTEXT_SLOTS;
   bool HasHeapAllocatedLocals();
@@ skipping 38 matching lines @@
 
 
 // Cache for mapping (data, property name) into context slot index.
 // The cache contains both positive and negative results.
 // Slot index equals -1 means the property is absent.
 // Cleared at startup and prior to mark sweep collection.
 class ContextSlotCache {
  public:
   // Lookup context slot index for (data, name).
   // If absent, kNotFound is returned.
-  static int Lookup(Object* data,
-                    String* name,
-                    Variable::Mode* mode);
+  int Lookup(Object* data,
+             String* name,
+             Variable::Mode* mode);
 
   // Update an element in the cache.
-  static void Update(Object* data,
+  void Update(Object* data,
+              String* name,
+              Variable::Mode mode,
+              int slot_index);
+
+  // Clear the cache.
+  void Clear();
+
+  static const int kNotFound = -2;
+ private:
+  ContextSlotCache() {
+    for (int i = 0; i < kLength; ++i) {
+      keys_[i].data = NULL;
+      keys_[i].name = NULL;
+      values_[i] = kNotFound;
+    }
+  }
+
+  inline static int Hash(Object* data, String* name);
+
+#ifdef DEBUG
+  void ValidateEntry(Object* data,
                      String* name,
                      Variable::Mode mode,
                      int slot_index);
-
-  // Clear the cache.
-  static void Clear();
-
-  static const int kNotFound = -2;
- private:
-  inline static int Hash(Object* data, String* name);
-
-#ifdef DEBUG
-  static void ValidateEntry(Object* data,
-                            String* name,
-                            Variable::Mode mode,
-                            int slot_index);
 #endif
 
   static const int kLength = 256;
   struct Key {
     Object* data;
     String* name;
   };
 
   struct Value {
     Value(Variable::Mode mode, int index) {
@@ skipping 13 matching lines @@
     int index() { return IndexField::decode(value_); }
 
     // Bit fields in value_ (type, shift, size). Must be public so the
     // constants can be embedded in generated code.
     class ModeField:  public BitField<Variable::Mode, 0, 3> {};
     class IndexField: public BitField<int,            3, 32-3> {};
    private:
     uint32_t value_;
   };
 
-  static Key keys_[kLength];
-  static uint32_t values_[kLength];
+  Key keys_[kLength];
+  uint32_t values_[kLength];
+
+  friend class Isolate;
+  DISALLOW_COPY_AND_ASSIGN(ContextSlotCache);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_SCOPEINFO_H_