Distinction between FeedbackVectorICSlot and FeedbackVectorSlot eliminated.

src/hydrogen-instructions.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_HYDROGEN_INSTRUCTIONS_H_
 #define V8_HYDROGEN_INSTRUCTIONS_H_
 
 #include <cstring>
 #include <iosfwd>
 
@@ skipping 2386 matching lines @@
 class HCallFunction final : public HBinaryCall {
  public:
   DECLARE_INSTRUCTION_WITH_CONTEXT_FACTORY_P2(HCallFunction, HValue*, int);
   DECLARE_INSTRUCTION_WITH_CONTEXT_FACTORY_P3(
       HCallFunction, HValue*, int, CallFunctionFlags);
 
   HValue* context() const { return first(); }
   HValue* function() const { return second(); }
   CallFunctionFlags function_flags() const { return function_flags_; }
 
-  FeedbackVectorICSlot slot() const { return slot_; }
+  FeedbackVectorSlot slot() const { return slot_; }
   Handle<TypeFeedbackVector> feedback_vector() const {
     return feedback_vector_;
   }
   bool HasVectorAndSlot() const { return !feedback_vector_.is_null(); }
   void SetVectorAndSlot(Handle<TypeFeedbackVector> vector,
-                        FeedbackVectorICSlot slot) {
+                        FeedbackVectorSlot slot) {
     feedback_vector_ = vector;
     slot_ = slot;
   }
 
   DECLARE_CONCRETE_INSTRUCTION(CallFunction)
 
   std::ostream& PrintDataTo(std::ostream& os) const override;  // NOLINT
 
   int argument_delta() const override { return -argument_count(); }
 
  private:
   HCallFunction(HValue* context, HValue* function, int argument_count,
                 CallFunctionFlags flags = NO_CALL_FUNCTION_FLAGS)
       : HBinaryCall(context, function, argument_count),
-        function_flags_(flags),
-        slot_(FeedbackVectorICSlot::Invalid()) {}
+        function_flags_(flags) {}
   CallFunctionFlags function_flags_;
   Handle<TypeFeedbackVector> feedback_vector_;
-  FeedbackVectorICSlot slot_;
+  FeedbackVectorSlot slot_;
 };
 
 
 class HCallNew final : public HBinaryCall {
  public:
   DECLARE_INSTRUCTION_WITH_CONTEXT_FACTORY_P2(HCallNew, HValue*, int);
 
   HValue* context() { return first(); }
   HValue* constructor() { return second(); }
 
@@ skipping 2965 matching lines @@
 
 class HLoadGlobalGeneric final : public HTemplateInstruction<2> {
  public:
   DECLARE_INSTRUCTION_WITH_CONTEXT_FACTORY_P3(HLoadGlobalGeneric, HValue*,
                                               Handle<String>, TypeofMode);
 
   HValue* context() { return OperandAt(0); }
   HValue* global_object() { return OperandAt(1); }
   Handle<String> name() const { return name_; }
   TypeofMode typeof_mode() const { return typeof_mode_; }
-  FeedbackVectorICSlot slot() const { return slot_; }
+  FeedbackVectorSlot slot() const { return slot_; }
   Handle<TypeFeedbackVector> feedback_vector() const {
     return feedback_vector_;
   }
   bool HasVectorAndSlot() const { return true; }
   void SetVectorAndSlot(Handle<TypeFeedbackVector> vector,
-                        FeedbackVectorICSlot slot) {
+                        FeedbackVectorSlot slot) {
     feedback_vector_ = vector;
     slot_ = slot;
   }
 
   std::ostream& PrintDataTo(std::ostream& os) const override;  // NOLINT
 
   Representation RequiredInputRepresentation(int index) override {
     return Representation::Tagged();
   }
 
   DECLARE_CONCRETE_INSTRUCTION(LoadGlobalGeneric)
 
  private:
   HLoadGlobalGeneric(HValue* context, HValue* global_object,
                      Handle<String> name, TypeofMode typeof_mode)
-      : name_(name),
-        typeof_mode_(typeof_mode),
-        slot_(FeedbackVectorICSlot::Invalid()) {
+      : name_(name), typeof_mode_(typeof_mode) {
     SetOperandAt(0, context);
     SetOperandAt(1, global_object);
     set_representation(Representation::Tagged());
     SetAllSideEffects();
   }
 
   Handle<String> name_;
   TypeofMode typeof_mode_;
   Handle<TypeFeedbackVector> feedback_vector_;
-  FeedbackVectorICSlot slot_;
+  FeedbackVectorSlot slot_;
 };
 
 
 class HLoadGlobalViaContext final : public HTemplateInstruction<1> {
  public:
   DECLARE_INSTRUCTION_WITH_CONTEXT_FACTORY_P2(HLoadGlobalViaContext, int, int);
 
   HValue* context() { return OperandAt(0); }
   int depth() const { return depth_; }
   int slot_index() const { return slot_index_; }
@@ skipping 1005 matching lines @@
                                               Handle<Name>, LanguageMode,
                                               InlineCacheState);
 
   HValue* context() const { return OperandAt(0); }
   HValue* object() const { return OperandAt(1); }
   Handle<Name> name() const { return name_; }
 
   InlineCacheState initialization_state() const {
     return initialization_state_;
   }
-  FeedbackVectorICSlot slot() const { return slot_; }
+  FeedbackVectorSlot slot() const { return slot_; }
   Handle<TypeFeedbackVector> feedback_vector() const {
     return feedback_vector_;
   }
   bool HasVectorAndSlot() const { return true; }
   void SetVectorAndSlot(Handle<TypeFeedbackVector> vector,
-                        FeedbackVectorICSlot slot) {
+                        FeedbackVectorSlot slot) {
     feedback_vector_ = vector;
     slot_ = slot;
   }
 
   Representation RequiredInputRepresentation(int index) override {
     return Representation::Tagged();
   }
 
   std::ostream& PrintDataTo(std::ostream& os) const override;  // NOLINT
 
   DECLARE_CONCRETE_INSTRUCTION(LoadNamedGeneric)
 
   LanguageMode language_mode() const { return language_mode_; }
 
  private:
   HLoadNamedGeneric(HValue* context, HValue* object, Handle<Name> name,
                     LanguageMode language_mode,
                     InlineCacheState initialization_state)
       : name_(name),
-        slot_(FeedbackVectorICSlot::Invalid()),
         language_mode_(language_mode),
         initialization_state_(initialization_state) {
     SetOperandAt(0, context);
     SetOperandAt(1, object);
     set_representation(Representation::Tagged());
     SetAllSideEffects();
   }
 
   Handle<Name> name_;
   Handle<TypeFeedbackVector> feedback_vector_;
-  FeedbackVectorICSlot slot_;
+  FeedbackVectorSlot slot_;
   LanguageMode language_mode_;
   InlineCacheState initialization_state_;
 };
 
 
 class HLoadFunctionPrototype final : public HUnaryOperation {
  public:
   DECLARE_INSTRUCTION_FACTORY_P1(HLoadFunctionPrototype, HValue*);
 
   HValue* function() { return OperandAt(0); }
@@ skipping 220 matching lines @@
  public:
   DECLARE_INSTRUCTION_WITH_CONTEXT_FACTORY_P4(HLoadKeyedGeneric, HValue*,
                                               HValue*, LanguageMode,
                                               InlineCacheState);
   HValue* object() const { return OperandAt(0); }
   HValue* key() const { return OperandAt(1); }
   HValue* context() const { return OperandAt(2); }
   InlineCacheState initialization_state() const {
     return initialization_state_;
   }
-  FeedbackVectorICSlot slot() const { return slot_; }
+  FeedbackVectorSlot slot() const { return slot_; }
   Handle<TypeFeedbackVector> feedback_vector() const {
     return feedback_vector_;
   }
   bool HasVectorAndSlot() const {
     DCHECK(initialization_state_ == MEGAMORPHIC || !feedback_vector_.is_null());
     return !feedback_vector_.is_null();
   }
   void SetVectorAndSlot(Handle<TypeFeedbackVector> vector,
-                        FeedbackVectorICSlot slot) {
+                        FeedbackVectorSlot slot) {
     feedback_vector_ = vector;
     slot_ = slot;
   }
 
   std::ostream& PrintDataTo(std::ostream& os) const override;  // NOLINT
 
   Representation RequiredInputRepresentation(int index) override {
     // tagged[tagged]
     return Representation::Tagged();
   }
 
   HValue* Canonicalize() override;
 
   DECLARE_CONCRETE_INSTRUCTION(LoadKeyedGeneric)
 
   LanguageMode language_mode() const { return language_mode_; }
 
  private:
   HLoadKeyedGeneric(HValue* context, HValue* obj, HValue* key,
                     LanguageMode language_mode,
                     InlineCacheState initialization_state)
-      : slot_(FeedbackVectorICSlot::Invalid()),
-        initialization_state_(initialization_state),
+      : initialization_state_(initialization_state),
         language_mode_(language_mode) {
     set_representation(Representation::Tagged());
     SetOperandAt(0, obj);
     SetOperandAt(1, key);
     SetOperandAt(2, context);
     SetAllSideEffects();
   }
 
   Handle<TypeFeedbackVector> feedback_vector_;
-  FeedbackVectorICSlot slot_;
+  FeedbackVectorSlot slot_;
   InlineCacheState initialization_state_;
   LanguageMode language_mode_;
 };
 
 
 // Indicates whether the store is a store to an entry that was previously
 // initialized or not.
 enum StoreFieldOrKeyedMode {
   // The entry could be either previously initialized or not.
   INITIALIZING_STORE,
@@ skipping 164 matching lines @@
   InlineCacheState initialization_state() const {
     return initialization_state_;
   }
 
   std::ostream& PrintDataTo(std::ostream& os) const override;  // NOLINT
 
   Representation RequiredInputRepresentation(int index) override {
     return Representation::Tagged();
   }
 
-  FeedbackVectorICSlot slot() const { return slot_; }
+  FeedbackVectorSlot slot() const { return slot_; }
   Handle<TypeFeedbackVector> feedback_vector() const {
     return feedback_vector_;
   }
   bool HasVectorAndSlot() const { return FLAG_vector_stores; }
   void SetVectorAndSlot(Handle<TypeFeedbackVector> vector,
-                        FeedbackVectorICSlot slot) {
+                        FeedbackVectorSlot slot) {
     feedback_vector_ = vector;
     slot_ = slot;
   }
 
   DECLARE_CONCRETE_INSTRUCTION(StoreNamedGeneric)
 
  private:
   HStoreNamedGeneric(HValue* context, HValue* object, Handle<Name> name,
                      HValue* value, LanguageMode language_mode,
                      InlineCacheState initialization_state)
       : name_(name),
-        slot_(FeedbackVectorICSlot::Invalid()),
         language_mode_(language_mode),
         initialization_state_(initialization_state) {
     SetOperandAt(0, object);
     SetOperandAt(1, value);
     SetOperandAt(2, context);
     SetAllSideEffects();
   }
 
   Handle<Name> name_;
   Handle<TypeFeedbackVector> feedback_vector_;
-  FeedbackVectorICSlot slot_;
+  FeedbackVectorSlot slot_;
   LanguageMode language_mode_;
   InlineCacheState initialization_state_;
 };
 
 
 class HStoreGlobalViaContext final : public HTemplateInstruction<2> {
  public:
   DECLARE_INSTRUCTION_WITH_CONTEXT_FACTORY_P4(HStoreGlobalViaContext, HValue*,
                                               int, int, LanguageMode);
   HValue* context() const { return OperandAt(0); }
@@ skipping 209 matching lines @@
   LanguageMode language_mode() const { return language_mode_; }
   InlineCacheState initialization_state() const {
     return initialization_state_;
   }
 
   Representation RequiredInputRepresentation(int index) override {
     // tagged[tagged] = tagged
     return Representation::Tagged();
   }
 
-  FeedbackVectorICSlot slot() const { return slot_; }
+  FeedbackVectorSlot slot() const { return slot_; }
   Handle<TypeFeedbackVector> feedback_vector() const {
     return feedback_vector_;
   }
   bool HasVectorAndSlot() const {
     DCHECK(!(FLAG_vector_stores && initialization_state_ != MEGAMORPHIC) ||
            !feedback_vector_.is_null());
     return !feedback_vector_.is_null();
   }
   void SetVectorAndSlot(Handle<TypeFeedbackVector> vector,
-                        FeedbackVectorICSlot slot) {
+                        FeedbackVectorSlot slot) {
     feedback_vector_ = vector;
     slot_ = slot;
   }
 
   std::ostream& PrintDataTo(std::ostream& os) const override;  // NOLINT
 
   DECLARE_CONCRETE_INSTRUCTION(StoreKeyedGeneric)
 
  private:
   HStoreKeyedGeneric(HValue* context, HValue* object, HValue* key,
                      HValue* value, LanguageMode language_mode,
                      InlineCacheState initialization_state)
-      : slot_(FeedbackVectorICSlot::Invalid()),
-        language_mode_(language_mode),
+      : language_mode_(language_mode),
         initialization_state_(initialization_state) {
     SetOperandAt(0, object);
     SetOperandAt(1, key);
     SetOperandAt(2, value);
     SetOperandAt(3, context);
     SetAllSideEffects();
   }
 
   Handle<TypeFeedbackVector> feedback_vector_;
-  FeedbackVectorICSlot slot_;
+  FeedbackVectorSlot slot_;
   LanguageMode language_mode_;
   InlineCacheState initialization_state_;
 };
 
 
 class HTransitionElementsKind final : public HTemplateInstruction<2> {
  public:
   inline static HTransitionElementsKind* New(Isolate* isolate, Zone* zone,
                                              HValue* context, HValue* object,
                                              Handle<Map> original_map,
@@ skipping 693 matching lines @@
 
 
 
 #undef DECLARE_INSTRUCTION
 #undef DECLARE_CONCRETE_INSTRUCTION
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_HYDROGEN_INSTRUCTIONS_H_