Distinction between FeedbackVectorICSlot and FeedbackVectorSlot eliminated.

src/heap/heap.cc

 // Copyright 2012 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/heap/heap.h"
 
 #include "src/accessors.h"
 #include "src/api.h"
 #include "src/base/bits.h"
 #include "src/base/once.h"
@@ skipping 2703 matching lines @@
   // Allocate object to hold object observation state.
   set_observation_state(*factory->NewJSObjectFromMap(
       factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize)));
 
   // Microtask queue uses the empty fixed array as a sentinel for "empty".
   // Number of queued microtasks stored in Isolate::pending_microtask_count().
   set_microtask_queue(empty_fixed_array());
 
   {
     FeedbackVectorSlotKind kinds[] = {FeedbackVectorSlotKind::LOAD_IC,
+                                      FeedbackVectorSlotKind::INVALID,
                                       FeedbackVectorSlotKind::KEYED_LOAD_IC,
+                                      FeedbackVectorSlotKind::INVALID,
                                       FeedbackVectorSlotKind::STORE_IC,
-                                      FeedbackVectorSlotKind::KEYED_STORE_IC};
-    StaticFeedbackVectorSpec spec(0, 4, kinds);
+                                      FeedbackVectorSlotKind::INVALID,
+                                      FeedbackVectorSlotKind::KEYED_STORE_IC,
+                                      FeedbackVectorSlotKind::INVALID};
+    StaticFeedbackVectorSpec spec(arraysize(kinds), kinds);
     Handle<TypeFeedbackVector> dummy_vector =
-        factory->NewTypeFeedbackVector(&spec);
-    for (int i = 0; i < 4; i++) {
-      dummy_vector->Set(FeedbackVectorICSlot(0),

[Igor Sheludko, 2015/09/30 16:30:56]

I guess we wanted to use FeedbackVectorICSlot(i) here...

[mvstanton, 2015/10/01 10:24:31]

Good catch.

-                        *TypeFeedbackVector::MegamorphicSentinel(isolate()),
-                        SKIP_WRITE_BARRIER);
+        TypeFeedbackVector::New(isolate(), &spec);
+    for (int i = 0; i < spec.slots(); i++) {
+      if (kinds[i] != FeedbackVectorSlotKind::INVALID) {
+        dummy_vector->Set(FeedbackVectorSlot(i),
+                          *TypeFeedbackVector::MegamorphicSentinel(isolate()),
+                          SKIP_WRITE_BARRIER);
+      }
     }
+    DCHECK_EQ(FeedbackVectorSlotKind::LOAD_IC,
+              dummy_vector->GetKind(
+                  FeedbackVectorSlot(TypeFeedbackVector::kDummyLoadICSlot)));
+    DCHECK_EQ(FeedbackVectorSlotKind::KEYED_LOAD_IC,
+              dummy_vector->GetKind(FeedbackVectorSlot(
+                  TypeFeedbackVector::kDummyKeyedLoadICSlot)));
+    DCHECK_EQ(FeedbackVectorSlotKind::STORE_IC,
+              dummy_vector->GetKind(
+                  FeedbackVectorSlot(TypeFeedbackVector::kDummyStoreICSlot)));
+    DCHECK_EQ(FeedbackVectorSlotKind::KEYED_STORE_IC,
+              dummy_vector->GetKind(FeedbackVectorSlot(
+                  TypeFeedbackVector::kDummyKeyedStoreICSlot)));
+
     set_dummy_vector(*dummy_vector);
   }
 
   set_detached_contexts(empty_fixed_array());
   set_retained_maps(ArrayList::cast(empty_fixed_array()));
 
   set_weak_object_to_code_table(
       *WeakHashTable::New(isolate(), 16, USE_DEFAULT_MINIMUM_CAPACITY,
                           TENURED));
 
@@ skipping 3340 matching lines @@
 }
 
 
 // static
 int Heap::GetStaticVisitorIdForMap(Map* map) {
   return StaticVisitorBase::GetVisitorId(map);
 }
 
 }  // namespace internal
 }  // namespace v8