Use platform specific stubs for vector-based Load/KeyedLoad.

src/type-feedback-vector.h

 // Copyright 2014 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_TYPE_FEEDBACK_VECTOR_H_
 #define V8_TYPE_FEEDBACK_VECTOR_H_
 
 #include <vector>
 
 #include "src/checks.h"
@@ skipping 56 matching lines @@
   static TypeFeedbackVector* cast(Object* obj) {
     DCHECK(obj->IsTypeFeedbackVector());
     return reinterpret_cast<TypeFeedbackVector*>(obj);
   }
 
   static const int kReservedIndexCount = 3;
   static const int kFirstICSlotIndex = 0;
   static const int kWithTypesIndex = 1;
   static const int kGenericCountIndex = 2;
 
+  static int elements_per_ic_slot() { return FLAG_vector_ics ? 2 : 1; }
+
   int first_ic_slot_index() const {
     DCHECK(length() >= kReservedIndexCount);
     return Smi::cast(get(kFirstICSlotIndex))->value();
   }
 
   int ic_with_type_info_count() {
     return length() > 0 ? Smi::cast(get(kWithTypesIndex))->value() : 0;
   }
 
   void change_ic_with_type_info_count(int delta) {
@@ skipping 20 matching lines @@
   inline int ic_metadata_length() const;
 
   int Slots() const {
     if (length() == 0) return 0;
     return Max(
         0, first_ic_slot_index() - ic_metadata_length() - kReservedIndexCount);
   }
 
   int ICSlots() const {
     if (length() == 0) return 0;
-    return length() - first_ic_slot_index();
+    return (length() - first_ic_slot_index()) / elements_per_ic_slot();
   }
 
   // Conversion from a slot or ic slot to an integer index to the underlying
   // array.
   int GetIndex(FeedbackVectorSlot slot) const {
     DCHECK(slot.ToInt() < first_ic_slot_index());
     return kReservedIndexCount + ic_metadata_length() + slot.ToInt();
   }
 
   int GetIndex(FeedbackVectorICSlot slot) const {
     int first_ic_slot = first_ic_slot_index();
     DCHECK(slot.ToInt() < ICSlots());
-    return first_ic_slot + slot.ToInt();
+    return first_ic_slot + slot.ToInt() * elements_per_ic_slot();
   }
 
   // Conversion from an integer index to either a slot or an ic slot. The caller
   // should know what kind she expects.
   FeedbackVectorSlot ToSlot(int index) const {
     DCHECK(index >= kReservedIndexCount && index < first_ic_slot_index());
     return FeedbackVectorSlot(index - ic_metadata_length() -
                               kReservedIndexCount);
   }
 
   FeedbackVectorICSlot ToICSlot(int index) const {
     DCHECK(index >= first_ic_slot_index() && index < length());
-    return FeedbackVectorICSlot(index - first_ic_slot_index());
+    int ic_slot = (index - first_ic_slot_index()) / elements_per_ic_slot();
+    return FeedbackVectorICSlot(ic_slot);
   }
 
   Object* Get(FeedbackVectorSlot slot) const { return get(GetIndex(slot)); }
   void Set(FeedbackVectorSlot slot, Object* value,
            WriteBarrierMode mode = UPDATE_WRITE_BARRIER) {
     set(GetIndex(slot), value, mode);
   }
 
   Object* Get(FeedbackVectorICSlot slot) const { return get(GetIndex(slot)); }
   void Set(FeedbackVectorICSlot slot, Object* value,
@@ skipping 91 matching lines @@
 
   virtual InlineCacheState StateFromFeedback() const = 0;
   virtual int ExtractMaps(MapHandleList* maps) const = 0;
   virtual MaybeHandle<Code> FindHandlerForMap(Handle<Map> map) const = 0;
   virtual bool FindHandlers(CodeHandleList* code_list, int length = -1) const {
     return length == 0;
   }
   virtual Name* FindFirstName() const { return NULL; }
 
   Object* GetFeedback() const { return vector()->Get(slot()); }
+  Object* GetFeedbackExtra() const {
+    DCHECK(TypeFeedbackVector::elements_per_ic_slot() > 1);
+    int extra_index = vector()->GetIndex(slot()) + 1;
+    return vector()->get(extra_index);
+  }
 
  protected:
   Isolate* GetIsolate() const { return vector()->GetIsolate(); }
 
   void SetFeedback(Object* feedback,
                    WriteBarrierMode mode = UPDATE_WRITE_BARRIER) {
     vector()->Set(slot(), feedback, mode);
   }
 
+  void SetFeedbackExtra(Object* feedback_extra,
+                        WriteBarrierMode mode = UPDATE_WRITE_BARRIER) {
+    DCHECK(TypeFeedbackVector::elements_per_ic_slot() > 1);
+    int index = vector()->GetIndex(slot()) + 1;
+    vector()->set(index, feedback_extra, mode);
+  }
+
   Handle<FixedArray> EnsureArrayOfSize(int length);
-  void InstallHandlers(int start_index, MapHandleList* maps,
+  Handle<FixedArray> EnsureExtraArrayOfSize(int length);
+  void InstallHandlers(Handle<FixedArray> array, MapHandleList* maps,
                        CodeHandleList* handlers);
-  int ExtractMaps(int start_index, MapHandleList* maps) const;
-  MaybeHandle<Code> FindHandlerForMap(int start_index, Handle<Map> map) const;
-  bool FindHandlers(int start_index, CodeHandleList* code_list,
-                    int length) const;
+
+  int ExtractMapsImpl(MapHandleList* maps) const;

[Toon Verwaest, 2015/03/11 17:55:02]

Impl?

[mvstanton, 2015/03/12 17:05:34]

I'll reorganize this, providing a base implementation of these three functions
which LoadICNexus and KeyedLoadICNexus don't have to override.

+  MaybeHandle<Code> FindHandlerForMapImpl(Handle<Map> map) const;
+  bool FindHandlersImpl(CodeHandleList* code_list, int length) const;
 
  private:
   // The reason for having a vector handle and a raw pointer is that we can and
   // should use handles during IC miss, but not during GC when we clear ICs. If
   // you have a handle to the vector that is better because more operations can
   // be done, like allocation.
   Handle<TypeFeedbackVector> vector_handle_;
   TypeFeedbackVector* vector_;
   FeedbackVectorICSlot slot_;
 };
@@ skipping 86 matching lines @@
   int ExtractMaps(MapHandleList* maps) const OVERRIDE;
   MaybeHandle<Code> FindHandlerForMap(Handle<Map> map) const OVERRIDE;
   virtual bool FindHandlers(CodeHandleList* code_list,
                             int length = -1) const OVERRIDE;
   Name* FindFirstName() const OVERRIDE;
 };
 }
 }  // namespace v8::internal
 
 #endif  // V8_TRANSITIONS_H_