Distinction between FeedbackVectorICSlot and FeedbackVectorSlot eliminated.

src/objects-printer.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/objects.h"
 
 #include "src/disasm.h"
 #include "src/disassembler.h"
 #include "src/interpreter/bytecodes.h"
 #include "src/objects-inl.h"
@@ skipping 539 matching lines @@
   HeapObject::PrintHeader(os, "TypeFeedbackVector");
   os << " - length: " << length();
   if (length() == 0) {
     os << " (empty)\n";
     return;
   }
 
   os << "\n - ics with type info: " << ic_with_type_info_count();
   os << "\n - generic ics: " << ic_generic_count();
 
-  if (Slots() > 0) {
-    for (int i = 0; i < Slots(); i++) {
-      FeedbackVectorSlot slot(i);
-      os << "\n Slot " << i << " [" << GetIndex(slot)
-         << "]: " << Brief(Get(slot));
+  TypeFeedbackMetadataIterator iter(this);
+  while (iter.HasNext()) {
+    FeedbackVectorSlot slot = iter.Next();
+    FeedbackVectorSlotKind kind = iter.kind();
+
+    os << "\n ICSlot " << slot.ToInt() << " " << kind << " ";
+    switch (kind) {
+      case FeedbackVectorSlotKind::LOAD_IC: {
+        LoadICNexus nexus(this, slot);
+        os << Code::ICState2String(nexus.StateFromFeedback());
+        break;
+      }
+      case FeedbackVectorSlotKind::KEYED_LOAD_IC: {
+        KeyedLoadICNexus nexus(this, slot);
+        os << Code::ICState2String(nexus.StateFromFeedback());
+        break;
+      }
+      case FeedbackVectorSlotKind::CALL_IC: {
+        CallICNexus nexus(this, slot);
+        os << Code::ICState2String(nexus.StateFromFeedback());
+        break;
+      }
+      case FeedbackVectorSlotKind::STORE_IC: {
+        StoreICNexus nexus(this, slot);
+        os << Code::ICState2String(nexus.StateFromFeedback());
+        break;
+      }
+      case FeedbackVectorSlotKind::KEYED_STORE_IC: {
+        KeyedStoreICNexus nexus(this, slot);
+        os << Code::ICState2String(nexus.StateFromFeedback());
+        break;
+      }
+      case FeedbackVectorSlotKind::GENERAL:
+        break;
+      case FeedbackVectorSlotKind::INVALID:
+      case FeedbackVectorSlotKind::KINDS_NUMBER:
+        UNREACHABLE();
+        break;
     }
-  }
 
-  if (ICSlots() > 0) {
-    DCHECK(elements_per_ic_slot() == 2);
-
-    for (int i = 0; i < ICSlots(); i++) {
-      FeedbackVectorICSlot slot(i);
-      FeedbackVectorSlotKind kind = GetKind(slot);
-      os << "\n ICSlot " << i << " " << kind << " ";
-      switch (kind) {
-        case FeedbackVectorSlotKind::LOAD_IC: {
-          LoadICNexus nexus(this, slot);
-          os << Code::ICState2String(nexus.StateFromFeedback());
-          break;
-        }
-        case FeedbackVectorSlotKind::KEYED_LOAD_IC: {
-          KeyedLoadICNexus nexus(this, slot);
-          os << Code::ICState2String(nexus.StateFromFeedback());
-          break;
-        }
-        case FeedbackVectorSlotKind::CALL_IC: {
-          CallICNexus nexus(this, slot);
-          os << Code::ICState2String(nexus.StateFromFeedback());
-          break;
-        }
-        case FeedbackVectorSlotKind::STORE_IC: {
-          StoreICNexus nexus(this, slot);
-          os << Code::ICState2String(nexus.StateFromFeedback());
-          break;
-        }
-        case FeedbackVectorSlotKind::KEYED_STORE_IC: {
-          KeyedStoreICNexus nexus(this, slot);
-          os << Code::ICState2String(nexus.StateFromFeedback());
-          break;
-        }
-        case FeedbackVectorSlotKind::UNUSED:
-        case FeedbackVectorSlotKind::KINDS_NUMBER:
-          UNREACHABLE();
-          break;
-      }
-
-      os << "\n  [" << GetIndex(slot) << "]: " << Brief(Get(slot));
-      os << "\n  [" << (GetIndex(slot) + 1)
-         << "]: " << Brief(get(GetIndex(slot) + 1));
+    int entry_size = iter.entry_size();
+    for (int i = 0; i < entry_size; i++) {
+      int index = GetIndex(slot) + i;
+      os << "\n  [" << index << "]: " << Brief(get(index));
     }
   }
   os << "\n";
 }
 
 
 void JSValue::JSValuePrint(std::ostream& os) {  // NOLINT
   HeapObject::PrintHeader(os, "ValueObject");
   value()->Print(os);
 }
@@ skipping 680 matching lines @@
   }
 }
 
 
 void JSObject::PrintTransitions(std::ostream& os) {  // NOLINT
   TransitionArray::PrintTransitions(os, map()->raw_transitions());
 }
 #endif  // defined(DEBUG) || defined(OBJECT_PRINT)
 }  // namespace internal
 }  // namespace v8