Vector ICs: Stop iterating the heap to clear keyed store ics.

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 459 matching lines @@
       return "code_space";
     case LO_SPACE:
       return "large_object_space";
     default:
       UNREACHABLE();
   }
   return nullptr;
 }
 
 
-void Heap::ClearAllICsByKind(Code::Kind kind) {
-  // TODO(mvstanton): Do not iterate the heap.
-  HeapObjectIterator it(code_space());
+void Heap::ClearAllKeyedStoreICs() {

[Hannes Payer (out of office), 2015/08/26 21:46:33]

I do not like that heap owns this method. It has no heap dependencies. It could
be a static in KeyedStoreIC.

[mvstanton, 2015/08/27 08:17:33]

Okay, I've taken the new code and moved it. The call to code_space() in the old
code is a dependency. That branch will disappear when FLAG_vector_stores is
turned on, then discarded.

Also, I put the new code as a static in TypeFeedbackVector, because 1) in the
vector-based world, that is a good home, and 2) I felt much better about
including type-feedback-vector.h in heap.cc, than about including ic.h! The
former is at least a heap object, the latter is a whole byzantine world that
shouldn't be cluttering up heap.cc. :)

+  if (FLAG_vector_stores) {
+    SharedFunctionInfo::Iterator iterator(isolate_);
+    SharedFunctionInfo* shared;
+    while ((shared = iterator.Next())) {
+      TypeFeedbackVector* vector = shared->feedback_vector();
+      vector->ClearKeyedStoreICs(shared);
+    }
+  } else {
+    // TODO(mvstanton): Remove this branch when FLAG_vector_stores is turned on
+    // permanently.
+    HeapObjectIterator it(code_space());
 
-  for (Object* object = it.Next(); object != NULL; object = it.Next()) {
-    Code* code = Code::cast(object);
-    Code::Kind current_kind = code->kind();
-    if (current_kind == Code::FUNCTION ||
-        current_kind == Code::OPTIMIZED_FUNCTION) {
-      code->ClearInlineCaches(kind);
+    for (Object* object = it.Next(); object != NULL; object = it.Next()) {
+      Code* code = Code::cast(object);
+      Code::Kind current_kind = code->kind();
+      if (current_kind == Code::FUNCTION ||
+          current_kind == Code::OPTIMIZED_FUNCTION) {
+        code->ClearInlineCaches(Code::KEYED_STORE_IC);
+      }
     }
   }
 }
 
 
 void Heap::RepairFreeListsAfterDeserialization() {
   PagedSpaces spaces(this);
   for (PagedSpace* space = spaces.next(); space != NULL;
        space = spaces.next()) {
     space->RepairFreeListsAfterDeserialization();
@@ skipping 6272 matching lines @@
     *object_type = "CODE_TYPE";                                                \
     *object_sub_type = "CODE_AGE/" #name;                                      \
     return true;
     CODE_AGE_LIST_COMPLETE(COMPARE_AND_RETURN_NAME)
 #undef COMPARE_AND_RETURN_NAME
   }
   return false;
 }
 }  // namespace internal
 }  // namespace v8