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

src/heap/heap.cc

Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index ec3837cfbec09c4ce8f52b2e9a7530d8203863c4..531c170c140007f3a4869a3114461ac7771a7074 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -477,16 +477,26 @@ const char* Heap::GetSpaceName(int idx) {
 }
 
 
-void Heap::ClearAllICsByKind(Code::Kind kind) {
-  // TODO(mvstanton): Do not iterate the heap.
-  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);
+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(Code::KEYED_STORE_IC);
+      }
     }
   }
 }