Distinction between FeedbackVectorICSlot and FeedbackVectorSlot eliminated.

src/compiler/js-type-feedback.cc

 // 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.
 
 #include "src/compiler/js-type-feedback.h"
 
 #include "src/property-details.h"
 
 #include "src/accessors.h"
 #include "src/ast.h"
@@ skipping 14 matching lines @@
 
 enum LoadOrStore { LOAD, STORE };
 
 // TODO(turbofan): fix deoptimization problems
 #define ENABLE_FAST_PROPERTY_LOADS false
 #define ENABLE_FAST_PROPERTY_STORES false
 
 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) {
   type_feedback_id_map_.insert(std::make_pair(node->id(), 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));
 }
 
 
 Reduction JSTypeFeedbackSpecializer::Reduce(Node* node) {
   switch (node->opcode()) {
     case IrOpcode::kJSLoadProperty:
       return ReduceJSLoadProperty(node);
     case IrOpcode::kJSLoadNamed:
       return ReduceJSLoadNamed(node);
     case IrOpcode::kJSLoadGlobal:
@@ skipping 85 matching lines @@
 
 Reduction JSTypeFeedbackSpecializer::ReduceJSLoadNamed(Node* node) {
   DCHECK(node->opcode() == IrOpcode::kJSLoadNamed);
   if (mode() != kDeoptimizationEnabled) return NoChange();
   Node* frame_state_before = GetFrameStateBefore(node);
   if (frame_state_before == nullptr) return NoChange();
 
   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.
     return NoChange();
   }
   oracle()->PropertyReceiverTypes(slot, p.name(), &maps);
 
   Node* receiver = node->InputAt(0);
   Node* effect = NodeProperties::GetEffectInput(node);
 
@@ skipping 193 matching lines @@
       BailoutId id = OpParameter<FrameStateInfo>(node).bailout_id();
       if (id != BailoutId::None()) return frame_state;
     }
   }
   return nullptr;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8