Distinction between FeedbackVectorICSlot and FeedbackVectorSlot eliminated.

src/hydrogen.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_H_
 #define V8_HYDROGEN_H_
 
 #include "src/accessors.h"
 #include "src/allocation.h"
 #include "src/ast.h"
@@ skipping 2465 matching lines @@
   static bool CanInlineArrayResizeOperation(Handle<Map> receiver_map);
 
   // If --trace-inlining, print a line of the inlining trace.  Inlining
   // succeeded if the reason string is NULL and failed if there is a
   // non-NULL reason string.
   void TraceInline(Handle<JSFunction> target,
                    Handle<JSFunction> caller,
                    const char* failure_reason);
 
   void HandleGlobalVariableAssignment(Variable* var, HValue* value,
-                                      FeedbackVectorICSlot ic_slot,
+                                      FeedbackVectorSlot slot,
                                       BailoutId ast_id);
 
   void HandlePropertyAssignment(Assignment* expr);
   void HandleCompoundAssignment(Assignment* expr);
   void HandlePolymorphicNamedFieldAccess(
-      PropertyAccessType access_type, Expression* expr,
-      FeedbackVectorICSlot slot, BailoutId ast_id, BailoutId return_id,
-      HValue* object, HValue* value, SmallMapList* types, Handle<String> name);
+      PropertyAccessType access_type, Expression* expr, FeedbackVectorSlot slot,
+      BailoutId ast_id, BailoutId return_id, HValue* object, HValue* value,
+      SmallMapList* types, Handle<String> name);
 
   HValue* BuildAllocateExternalElements(
       ExternalArrayType array_type,
       bool is_zero_byte_offset,
       HValue* buffer, HValue* byte_offset, HValue* length);
   HValue* BuildAllocateFixedTypedArray(ExternalArrayType array_type,
                                        size_t element_size,
                                        ElementsKind fixed_elements_kind,
                                        HValue* byte_length, HValue* length,
                                        bool initialize);
@@ skipping 228 matching lines @@
     PropertyDetails details_;
   };
 
   HValue* BuildMonomorphicAccess(PropertyAccessInfo* info, HValue* object,
                                  HValue* checked_object, HValue* value,
                                  BailoutId ast_id, BailoutId return_id,
                                  bool can_inline_accessor = true);
 
   HValue* BuildNamedAccess(PropertyAccessType access, BailoutId ast_id,
                            BailoutId reutrn_id, Expression* expr,
-                           FeedbackVectorICSlot slot, HValue* object,
+                           FeedbackVectorSlot slot, HValue* object,
                            Handle<String> name, HValue* value,
                            bool is_uninitialized = false);
 
   void HandlePolymorphicCallNamed(Call* expr,
                                   HValue* receiver,
                                   SmallMapList* types,
                                   Handle<String> name);
   void HandleLiteralCompareTypeof(CompareOperation* expr,
                                   Expression* sub_expr,
                                   Handle<String> check);
@@ skipping 16 matching lines @@
                                       HValue* index);
 
   HValue* BuildBinaryOperation(
       BinaryOperation* expr,
       HValue* left,
       HValue* right,
       PushBeforeSimulateBehavior push_sim_result);
   HInstruction* BuildIncrement(bool returns_original_input,
                                CountOperation* expr);
   HInstruction* BuildKeyedGeneric(PropertyAccessType access_type,
-                                  Expression* expr, FeedbackVectorICSlot slot,
+                                  Expression* expr, FeedbackVectorSlot slot,
                                   HValue* object, HValue* key, HValue* value);
 
   HInstruction* TryBuildConsolidatedElementLoad(HValue* object,
                                                 HValue* key,
                                                 HValue* val,
                                                 SmallMapList* maps);
 
   LoadKeyedHoleMode BuildKeyedHoleMode(Handle<Map> map);
 
   HInstruction* BuildMonomorphicElementAccess(HValue* object,
                                               HValue* key,
                                               HValue* val,
                                               HValue* dependency,
                                               Handle<Map> map,
                                               PropertyAccessType access_type,
                                               KeyedAccessStoreMode store_mode);
 
   HValue* HandlePolymorphicElementAccess(
-      Expression* expr, FeedbackVectorICSlot slot, HValue* object, HValue* key,
+      Expression* expr, FeedbackVectorSlot slot, HValue* object, HValue* key,
       HValue* val, SmallMapList* maps, PropertyAccessType access_type,
       KeyedAccessStoreMode store_mode, bool* has_side_effects);
 
   HValue* HandleKeyedElementAccess(HValue* obj, HValue* key, HValue* val,
-                                   Expression* expr, FeedbackVectorICSlot slot,
+                                   Expression* expr, FeedbackVectorSlot slot,
                                    BailoutId ast_id, BailoutId return_id,
                                    PropertyAccessType access_type,
                                    bool* has_side_effects);
 
   HInstruction* BuildNamedGeneric(PropertyAccessType access, Expression* expr,
-                                  FeedbackVectorICSlot slot, HValue* object,
+                                  FeedbackVectorSlot slot, HValue* object,
                                   Handle<Name> name, HValue* value,
                                   bool is_uninitialized = false);
 
   HCheckMaps* AddCheckMap(HValue* object, Handle<Map> map);
 
   void BuildLoad(Property* property,
                  BailoutId ast_id);
   void PushLoad(Property* property,
                 HValue* object,
                 HValue* key);
 
   void BuildStoreForEffect(Expression* expression, Property* prop,
-                           FeedbackVectorICSlot slot, BailoutId ast_id,
+                           FeedbackVectorSlot slot, BailoutId ast_id,
                            BailoutId return_id, HValue* object, HValue* key,
                            HValue* value);
 
   void BuildStore(Expression* expression, Property* prop,
-                  FeedbackVectorICSlot slot, BailoutId ast_id,
+                  FeedbackVectorSlot slot, BailoutId ast_id,
                   BailoutId return_id, bool is_uninitialized = false);
 
   HInstruction* BuildLoadNamedField(PropertyAccessInfo* info,
                                     HValue* checked_object);
   HInstruction* BuildStoreNamedField(PropertyAccessInfo* info,
                                      HValue* checked_object,
                                      HValue* value);
 
   HValue* BuildContextChainWalk(Variable* var);
 
@@ skipping 231 matching lines @@
 
  private:
   HGraphBuilder* builder_;
 };
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_HYDROGEN_H_