Distinction between FeedbackVectorICSlot and FeedbackVectorSlot eliminated.

src/compiler/js-type-feedback.cc

Index: src/compiler/js-type-feedback.cc
diff --git a/src/compiler/js-type-feedback.cc b/src/compiler/js-type-feedback.cc
index 395a7dccca70fa90de72dad7a8eee389cc922ad3..b1b4828fee1fe09d56cec7ad3c0b7a0ceb583d90 100644
--- a/src/compiler/js-type-feedback.cc
+++ b/src/compiler/js-type-feedback.cc
@@ -32,8 +32,8 @@ enum LoadOrStore { LOAD, STORE };
 JSTypeFeedbackTable::JSTypeFeedbackTable(Zone* zone)
     : type_feedback_id_map_(TypeFeedbackIdMap::key_compare(),
                             TypeFeedbackIdMap::allocator_type(zone)),
-      feedback_vector_ic_slot_map_(TypeFeedbackIdMap::key_compare(),
-                                   TypeFeedbackIdMap::allocator_type(zone)) {}
+      feedback_vector_slot_map_(TypeFeedbackIdMap::key_compare(),
+                                TypeFeedbackIdMap::allocator_type(zone)) {}
 
 
 void JSTypeFeedbackTable::Record(Node* node, TypeFeedbackId id) {
@@ -41,8 +41,8 @@ void JSTypeFeedbackTable::Record(Node* node, TypeFeedbackId id) {
 }
 
 
-void JSTypeFeedbackTable::Record(Node* node, FeedbackVectorICSlot slot) {
-  feedback_vector_ic_slot_map_.insert(std::make_pair(node->id(), slot));
+void JSTypeFeedbackTable::Record(Node* node, FeedbackVectorSlot slot) {
+  feedback_vector_slot_map_.insert(std::make_pair(node->id(), slot));
 }
 
 
@@ -148,7 +148,7 @@ Reduction JSTypeFeedbackSpecializer::ReduceJSLoadNamed(Node* node) {
   const LoadNamedParameters& p = LoadNamedParametersOf(node->op());
   SmallMapList maps;
 
-  FeedbackVectorICSlot slot = js_type_feedback_->FindFeedbackVectorICSlot(node);
+  FeedbackVectorSlot slot = js_type_feedback_->FindFeedbackVectorSlot(node);
   if (slot.IsInvalid() ||
       oracle()->LoadInlineCacheState(slot) == UNINITIALIZED) {
     // No type feedback ids or the load is uninitialized.