Distinction between FeedbackVectorICSlot and FeedbackVectorSlot eliminated.

test/cctest/test-compiler.cc

Index: test/cctest/test-compiler.cc
diff --git a/test/cctest/test-compiler.cc b/test/cctest/test-compiler.cc
index e35b430555187f59af58995f428a0de16a8579ed..6f8af3b3dd5cef94330480c5807be8e34ef4d8fd 100644
--- a/test/cctest/test-compiler.cc
+++ b/test/cctest/test-compiler.cc
@@ -309,11 +309,8 @@ TEST(FeedbackVectorPreservedAcrossRecompiles) {
   Handle<TypeFeedbackVector> feedback_vector(f->shared()->feedback_vector());
 
   // Verify that we gathered feedback.
-  int expected_slots = 0;
-  int expected_ic_slots = 1;
-  CHECK_EQ(expected_slots, feedback_vector->Slots());
-  CHECK_EQ(expected_ic_slots, feedback_vector->ICSlots());
-  FeedbackVectorICSlot slot_for_a(0);
+  CHECK(!feedback_vector->is_empty());
+  FeedbackVectorSlot slot_for_a(0);
   Object* object = feedback_vector->Get(slot_for_a);
   CHECK(object->IsWeakCell() &&
         WeakCell::cast(object)->value()->IsJSFunction());
@@ -354,17 +351,13 @@ TEST(FeedbackVectorUnaffectedByScopeChanges) {
 
   // Not compiled, and so no feedback vector allocated yet.
   CHECK(!f->shared()->is_compiled());
-  CHECK_EQ(0, f->shared()->feedback_vector()->Slots());
-  CHECK_EQ(0, f->shared()->feedback_vector()->ICSlots());
+  CHECK(f->shared()->feedback_vector()->is_empty());
 
   CompileRun("morphing_call();");
 
   // Now a feedback vector is allocated.
   CHECK(f->shared()->is_compiled());
-  int expected_slots = 0;
-  int expected_ic_slots = 2;
-  CHECK_EQ(expected_slots, f->shared()->feedback_vector()->Slots());
-  CHECK_EQ(expected_ic_slots, f->shared()->feedback_vector()->ICSlots());
+  CHECK(!f->shared()->feedback_vector()->is_empty());
 }