Distinction between FeedbackVectorICSlot and FeedbackVectorSlot eliminated.

src/compiler/js-type-feedback.h

 // Copyright 2015 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_COMPILER_JS_TYPE_FEEDBACK_H_
 #define V8_COMPILER_JS_TYPE_FEEDBACK_H_
 
 #include "src/utils.h"
 
 #include "src/compiler/graph-reducer.h"
@@ skipping 10 matching lines @@
 
 namespace compiler {
 
 // Stores type feedback information for nodes in the graph in a separate
 // data structure.
 class JSTypeFeedbackTable : public ZoneObject {
  public:
   explicit JSTypeFeedbackTable(Zone* zone);
 
   void Record(Node* node, TypeFeedbackId id);
-  void Record(Node* node, FeedbackVectorICSlot slot);
+  void Record(Node* node, FeedbackVectorSlot slot);
 
  private:
   friend class JSTypeFeedbackSpecializer;
   typedef std::map<NodeId, TypeFeedbackId, std::less<NodeId>,
                    zone_allocator<TypeFeedbackId> > TypeFeedbackIdMap;
-  typedef std::map<NodeId, FeedbackVectorICSlot, std::less<NodeId>,
-                   zone_allocator<FeedbackVectorICSlot> >
-      FeedbackVectorICSlotMap;
+  typedef std::map<NodeId, FeedbackVectorSlot, std::less<NodeId>,
+                   zone_allocator<FeedbackVectorSlot> > FeedbackVectorSlotMap;
 
   TypeFeedbackIdMap type_feedback_id_map_;
-  FeedbackVectorICSlotMap feedback_vector_ic_slot_map_;
+  FeedbackVectorSlotMap feedback_vector_slot_map_;
 
   TypeFeedbackId FindTypeFeedbackId(Node* node) {
     TypeFeedbackIdMap::const_iterator it =
         type_feedback_id_map_.find(node->id());
     return it == type_feedback_id_map_.end() ? TypeFeedbackId::None()
                                              : it->second;
   }
 
-  FeedbackVectorICSlot FindFeedbackVectorICSlot(Node* node) {
-    FeedbackVectorICSlotMap::const_iterator it =
-        feedback_vector_ic_slot_map_.find(node->id());
-    return it == feedback_vector_ic_slot_map_.end()
-               ? FeedbackVectorICSlot::Invalid()
-               : it->second;
+  FeedbackVectorSlot FindFeedbackVectorSlot(Node* node) {
+    FeedbackVectorSlotMap::const_iterator it =
+        feedback_vector_slot_map_.find(node->id());
+    return it == feedback_vector_slot_map_.end() ? FeedbackVectorSlot::Invalid()
+                                                 : it->second;
   }
 };
 
 
 // Specializes a graph to the type feedback recorded in the
 // {js_type_feedback} provided to the constructor.
 class JSTypeFeedbackSpecializer : public AdvancedReducer {
  public:
   enum DeoptimizationMode { kDeoptimizationEnabled, kDeoptimizationDisabled };
 
@@ skipping 43 matching lines @@
                      Node* effect, Node* control, Node** success, Node** fail);
 
   Node* GetFrameStateBefore(Node* node);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif