Revert of Embedded constant pools.

src/ic/ic.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_IC_H_
 #define V8_IC_H_
 
 #include "src/ic/ic-state.h"
 #include "src/macro-assembler.h"
 #include "src/messages.h"
@@ skipping 60 matching lines @@
   void UpdateState(Handle<Object> receiver, Handle<Object> name);
 
   bool IsNameCompatibleWithPrototypeFailure(Handle<Object> name);
   void MarkPrototypeFailure(Handle<Object> name) {
     DCHECK(IsNameCompatibleWithPrototypeFailure(name));
     old_state_ = state_;
     state_ = PROTOTYPE_FAILURE;
   }
 
   // Clear the inline cache to initial state.
-  static void Clear(Isolate* isolate, Address address, Address constant_pool);
+  static void Clear(Isolate* isolate, Address address,
+                    ConstantPoolArray* constant_pool);
 
 #ifdef DEBUG
   bool IsLoadStub() const {
     return target()->is_load_stub() || target()->is_keyed_load_stub();
   }
 
   bool IsStoreStub() const {
     return target()->is_store_stub() || target()->is_keyed_store_stub();
   }
 
@@ skipping 70 matching lines @@
   void TraceIC(const char* type, Handle<Object> name);
   void TraceIC(const char* type, Handle<Object> name, State old_state,
                State new_state);
 
   MaybeHandle<Object> TypeError(MessageTemplate::Template,
                                 Handle<Object> object, Handle<Object> key);
   MaybeHandle<Object> ReferenceError(Handle<Name> name);
 
   // Access the target code for the given IC address.
   static inline Code* GetTargetAtAddress(Address address,
-                                         Address constant_pool);
+                                         ConstantPoolArray* constant_pool);
   static inline void SetTargetAtAddress(Address address, Code* target,
-                                        Address constant_pool);
+                                        ConstantPoolArray* constant_pool);
   static void OnTypeFeedbackChanged(Isolate* isolate, Address address,
                                     State old_state, State new_state,
                                     bool target_remains_ic_stub);
   // As a vector-based IC, type feedback must be updated differently.
   static void OnTypeFeedbackChanged(Isolate* isolate, Code* host,
                                     TypeFeedbackVector* vector, State old_state,
                                     State new_state);
   static void PostPatching(Address address, Code* target, Code* old_target);
 
   // Compute the handler either by compiling or by retrieving a cached version.
@@ skipping 63 matching lines @@
   template <class NexusClass>
   NexusClass* casted_nexus() {
     return static_cast<NexusClass*>(nexus_);
   }
   FeedbackNexus* nexus() const { return nexus_; }
 
   inline Code* get_host();
 
  private:
   inline Code* raw_target() const;
-  inline Address constant_pool() const;
-  inline Address raw_constant_pool() const;
+  inline ConstantPoolArray* constant_pool() const;
+  inline ConstantPoolArray* raw_constant_pool() const;
 
   void FindTargetMaps() {
     if (target_maps_set_) return;
     target_maps_set_ = true;
     if (UseVector()) {
       nexus()->ExtractMaps(&target_maps_);
     } else {
       if (state_ == MONOMORPHIC) {
         Map* map = target_->FindFirstMap();
         if (map != NULL) target_maps_.Add(handle(map));
       } else if (state_ != UNINITIALIZED && state_ != PREMONOMORPHIC) {
         target_->FindAllMaps(&target_maps_);
       }
     }
   }
 
   // Frame pointer for the frame that uses (calls) the IC.
   Address fp_;
 
-  // All access to the program counter and constant pool of an IC structure is
-  // indirect to make the code GC safe. This feature is crucial since
+  // All access to the program counter of an IC structure is indirect
+  // to make the code GC safe. This feature is crucial since
   // GetProperty and SetProperty are called and they in turn might
   // invoke the garbage collector.
   Address* pc_address_;
 
+  Isolate* isolate_;
+
   // The constant pool of the code which originally called the IC (which might
   // be for the breakpointed copy of the original code).
-  Address* constant_pool_address_;
-
-  Isolate* isolate_;
+  Handle<ConstantPoolArray> raw_constant_pool_;
 
   // The original code target that missed.
   Handle<Code> target_;
   bool target_set_;
   bool vector_set_;
   State old_state_;  // For saving if we marked as prototype failure.
   State state_;
   Code::Kind kind_;
   Handle<Map> receiver_map_;
   MaybeHandle<Code> maybe_handler_;
@@ skipping 121 matching lines @@
   void UpdateCaches(LookupIterator* lookup);
 
   virtual Handle<Code> CompileHandler(LookupIterator* lookup,
                                       Handle<Object> unused,
                                       CacheHolderFlag cache_holder) override;
 
  private:
   Handle<Code> SimpleFieldLoad(FieldIndex index);
 
   static void Clear(Isolate* isolate, Address address, Code* target,
-                    Address constant_pool);
+                    ConstantPoolArray* constant_pool);
 
   friend class IC;
 };
 
 
 class KeyedLoadIC : public LoadIC {
  public:
   // ExtraICState bits (building on IC)
   class IcCheckTypeField : public BitField<IcCheckType, 1, 1> {};
 
@@ skipping 36 matching lines @@
   static Handle<Code> ChooseMegamorphicStub(Isolate* isolate);
 
   static void Clear(Isolate* isolate, Code* host, KeyedLoadICNexus* nexus);
 
  protected:
   // receiver is HeapObject because it could be a String or a JSObject
   Handle<Code> LoadElementStub(Handle<HeapObject> receiver);
 
  private:
   static void Clear(Isolate* isolate, Address address, Code* target,
-                    Address constant_pool);
+                    ConstantPoolArray* constant_pool);
 
   friend class IC;
 };
 
 
 class StoreIC : public IC {
  public:
   static ExtraICState ComputeExtraICState(LanguageMode flag) {
     return StoreICState(flag).GetExtraICState();
   }
@@ skipping 47 matching lines @@
   void UpdateCaches(LookupIterator* lookup, Handle<Object> value,
                     JSReceiver::StoreFromKeyed store_mode);
   virtual Handle<Code> CompileHandler(LookupIterator* lookup,
                                       Handle<Object> value,
                                       CacheHolderFlag cache_holder) override;
 
  private:
   inline void set_target(Code* code);
 
   static void Clear(Isolate* isolate, Address address, Code* target,
-                    Address constant_pool);
+                    ConstantPoolArray* constant_pool);
 
   friend class IC;
 };
 
 
 enum KeyedStoreCheckMap { kDontCheckMap, kCheckMap };
 
 
 enum KeyedStoreIncrementLength { kDontIncrementLength, kIncrementLength };
 
@@ skipping 60 matching lines @@
     }
   }
 
   Handle<Code> StoreElementStub(Handle<JSObject> receiver,
                                 KeyedAccessStoreMode store_mode);
 
  private:
   inline void set_target(Code* code);
 
   static void Clear(Isolate* isolate, Address address, Code* target,
-                    Address constant_pool);
+                    ConstantPoolArray* constant_pool);
 
   KeyedAccessStoreMode GetStoreMode(Handle<JSObject> receiver,
                                     Handle<Object> key, Handle<Object> value);
 
   Handle<Map> ComputeTransitionedMap(Handle<Map> map,
                                      KeyedAccessStoreMode store_mode);
 
   friend class IC;
 };
 
@@ skipping 30 matching lines @@
  private:
   static bool HasInlinedSmiCode(Address address);
 
   bool strict() const { return op_ == Token::EQ_STRICT; }
   Condition GetCondition() const { return ComputeCondition(op_); }
 
   static Code* GetRawUninitialized(Isolate* isolate, Token::Value op,
                                    bool strong);
 
   static void Clear(Isolate* isolate, Address address, Code* target,
-                    Address constant_pool);
+                    ConstantPoolArray* constant_pool);
 
   Token::Value op_;
 
   friend class IC;
 };
 
 
 class CompareNilIC : public IC {
  public:
   explicit CompareNilIC(Isolate* isolate) : IC(EXTRA_CALL_FRAME, isolate) {}
 
   Handle<Object> CompareNil(Handle<Object> object);
 
   static Handle<Code> GetUninitialized();
 
-  static void Clear(Address address, Code* target, Address constant_pool);
+  static void Clear(Address address, Code* target,
+                    ConstantPoolArray* constant_pool);
 
   static Handle<Object> DoCompareNilSlow(Isolate* isolate, NilValue nil,
                                          Handle<Object> object);
 };
 
 
 class ToBooleanIC : public IC {
  public:
   explicit ToBooleanIC(Isolate* isolate) : IC(EXTRA_CALL_FRAME, isolate) {}
 
@@ skipping 21 matching lines @@
 
 // Support functions for interceptor handlers.
 DECLARE_RUNTIME_FUNCTION(LoadPropertyWithInterceptorOnly);
 DECLARE_RUNTIME_FUNCTION(LoadPropertyWithInterceptor);
 DECLARE_RUNTIME_FUNCTION(LoadElementWithInterceptor);
 DECLARE_RUNTIME_FUNCTION(StorePropertyWithInterceptor);
 }
 }  // namespace v8::internal
 
 #endif  // V8_IC_H_