The metadata part of TypeFeedbackVector is extracted to TypeFeedbackMetadata array.

test/cctest/test-feedback-vector.cc

 // Copyright 2014 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/v8.h"
 #include "test/cctest/cctest.h"
 
 #include "src/api.h"
 #include "src/debug/debug.h"
 #include "src/execution.h"
@@ skipping 13 matching lines @@
 
 TEST(VectorStructure) {
   LocalContext context;
   v8::HandleScope scope(context->GetIsolate());
   Isolate* isolate = CcTest::i_isolate();
   Factory* factory = isolate->factory();
   Zone* zone = isolate->runtime_zone();
 
   // Empty vectors are the empty fixed array.
   StaticFeedbackVectorSpec empty;
-  Handle<TypeFeedbackVector> vector = TypeFeedbackVector::New(isolate, &empty);
+  Handle<TypeFeedbackVector> vector = NewTypeFeedbackVector(isolate, &empty);
   CHECK(Handle<FixedArray>::cast(vector)
             .is_identical_to(factory->empty_fixed_array()));
   // Which can nonetheless be queried.
   CHECK_EQ(0, vector->ic_with_type_info_count());
   CHECK_EQ(0, vector->ic_generic_count());
   CHECK(vector->is_empty());
 
   {
     FeedbackVectorSpec one_slot(zone);
     one_slot.AddGeneralSlot();
-    vector = TypeFeedbackVector::New(isolate, &one_slot);
+    vector = NewTypeFeedbackVector(isolate, &one_slot);
     FeedbackVectorHelper helper(vector);
     CHECK_EQ(1, helper.slot_count());
   }
 
   {
     FeedbackVectorSpec one_icslot(zone);
     one_icslot.AddCallICSlot();
-    vector = TypeFeedbackVector::New(isolate, &one_icslot);
+    vector = NewTypeFeedbackVector(isolate, &one_icslot);
     FeedbackVectorHelper helper(vector);
     CHECK_EQ(1, helper.slot_count());
   }
 
   {
     FeedbackVectorSpec spec(zone);
     for (int i = 0; i < 3; i++) {
       spec.AddGeneralSlot();
     }
     for (int i = 0; i < 5; i++) {
       spec.AddCallICSlot();
     }
-    vector = TypeFeedbackVector::New(isolate, &spec);
+    vector = NewTypeFeedbackVector(isolate, &spec);
     FeedbackVectorHelper helper(vector);
     CHECK_EQ(8, helper.slot_count());
 
-    int metadata_length = vector->ic_metadata_length();
-    CHECK(metadata_length > 0);
-
     int index = vector->GetIndex(helper.slot(0));
 
-    CHECK_EQ(TypeFeedbackVector::kReservedIndexCount + metadata_length, index);
-    CHECK(helper.slot(0) == vector->ToSlot(index));
+    CHECK_EQ(TypeFeedbackVector::kReservedIndexCount, index);
+    CHECK_EQ(helper.slot(0), vector->ToSlot(index));
 
     index = vector->GetIndex(helper.slot(3));
-    CHECK_EQ(TypeFeedbackVector::kReservedIndexCount + metadata_length + 3,
-             index);
-    CHECK(helper.slot(3) == vector->ToSlot(index));
+    CHECK_EQ(TypeFeedbackVector::kReservedIndexCount + 3, index);
+    CHECK_EQ(helper.slot(3), vector->ToSlot(index));
 
     index = vector->GetIndex(helper.slot(7));
-    CHECK_EQ(TypeFeedbackVector::kReservedIndexCount + metadata_length + 3 +
-                 4 * TypeFeedbackVector::GetSlotSize(
+    CHECK_EQ(TypeFeedbackVector::kReservedIndexCount + 3 +
+                 4 * TypeFeedbackMetadata::GetSlotSize(
                          FeedbackVectorSlotKind::CALL_IC),
              index);
-    CHECK(helper.slot(7) == vector->ToSlot(index));
+    CHECK_EQ(helper.slot(7), vector->ToSlot(index));
 
-    CHECK_EQ(TypeFeedbackVector::kReservedIndexCount + metadata_length + 3 +
-                 5 * TypeFeedbackVector::GetSlotSize(
+    CHECK_EQ(TypeFeedbackVector::kReservedIndexCount + 3 +
+                 5 * TypeFeedbackMetadata::GetSlotSize(
                          FeedbackVectorSlotKind::CALL_IC),
              vector->length());
   }
 }
 
 
 // IC slots need an encoding to recognize what is in there.
 TEST(VectorICMetadata) {
   LocalContext context;
   v8::HandleScope scope(context->GetIsolate());
@@ skipping 12 matching lines @@
         break;
       case 2:
         spec.AddLoadICSlot();
         break;
       case 3:
         spec.AddKeyedLoadICSlot();
         break;
     }
   }
 
-  Handle<TypeFeedbackVector> vector = TypeFeedbackVector::New(isolate, &spec);
+  Handle<TypeFeedbackVector> vector = NewTypeFeedbackVector(isolate, &spec);
   FeedbackVectorHelper helper(vector);
   CHECK_EQ(40, helper.slot_count());
 
   // Meanwhile set some feedback values and type feedback values to
   // verify the data structure remains intact.
   vector->change_ic_with_type_info_count(100);
   vector->change_ic_generic_count(3333);
   vector->Set(FeedbackVectorSlot(0), *vector);
 
   // Verify the metadata is correctly set up from the spec.
@@ skipping 24 matching lines @@
   Factory* factory = isolate->factory();
   Zone* zone = isolate->runtime_zone();
 
   // We only test clearing FeedbackVectorSlots, not FeedbackVectorSlots.
   // The reason is that FeedbackVectorSlots need a full code environment
   // to fully test (See VectorICProfilerStatistics test below).
   FeedbackVectorSpec spec(zone);
   for (int i = 0; i < 5; i++) {
     spec.AddGeneralSlot();
   }
-  Handle<TypeFeedbackVector> vector = TypeFeedbackVector::New(isolate, &spec);
+  Handle<TypeFeedbackVector> vector = NewTypeFeedbackVector(isolate, &spec);
   FeedbackVectorHelper helper(vector);
 
   // Fill with information
   vector->Set(helper.slot(0), Smi::FromInt(1));
   Handle<WeakCell> cell = factory->NewWeakCell(factory->fixed_array_map());
   vector->Set(helper.slot(1), *cell);
   Handle<AllocationSite> site = factory->NewAllocationSite();
   vector->Set(helper.slot(2), *site);
 
   // GC time clearing leaves slots alone.
@@ skipping 419 matching lines @@
   // There should be one IC slot.
   Handle<TypeFeedbackVector> feedback_vector(f->shared()->feedback_vector());
   FeedbackVectorHelper helper(feedback_vector);
   CHECK_EQ(1, helper.slot_count());
   FeedbackVectorSlot slot(0);
   StoreICNexus nexus(feedback_vector, slot);
   CHECK_EQ(MONOMORPHIC, nexus.StateFromFeedback());
 }
 
 }  // namespace