Vector ICs: Allow for more IC kinds.

test/cctest/test-heap.cc

Index: test/cctest/test-heap.cc
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
index 217ac0123eb3e96040cebb2ebfd358d197922285..0bfb8ba5fee49b41a707bc9290730873bbea32b7 100644
--- a/test/cctest/test-heap.cc
+++ b/test/cctest/test-heap.cc
@@ -3817,16 +3817,12 @@ TEST(IncrementalMarkingPreservesMonomorphicIC) {
   Handle<JSFunction> f = Handle<JSFunction>::cast(v8::Utils::OpenHandle(
       *v8::Handle<v8::Function>::Cast(CcTest::global()->Get(v8_str("f")))));
 
-  Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC);
   CheckVectorIC(f, 0, MONOMORPHIC);
-  CHECK(ic_before->ic_state() == DEFAULT);
 
   SimulateIncrementalMarking(CcTest::heap());
   CcTest::heap()->CollectAllGarbage();
 
-  Code* ic_after = FindFirstIC(f->shared()->code(), Code::LOAD_IC);
   CheckVectorIC(f, 0, MONOMORPHIC);
-  CHECK(ic_after->ic_state() == DEFAULT);
 }
 
 
@@ -3849,18 +3845,14 @@ TEST(IncrementalMarkingClearsMonomorphicIC) {
   Handle<JSFunction> f = Handle<JSFunction>::cast(v8::Utils::OpenHandle(
       *v8::Handle<v8::Function>::Cast(CcTest::global()->Get(v8_str("f")))));
 
-  Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC);
   CheckVectorIC(f, 0, MONOMORPHIC);
-  CHECK(ic_before->ic_state() == DEFAULT);
 
   // Fire context dispose notification.
   CcTest::isolate()->ContextDisposedNotification();
   SimulateIncrementalMarking(CcTest::heap());
   CcTest::heap()->CollectAllGarbage();
 
-  Code* ic_after = FindFirstIC(f->shared()->code(), Code::LOAD_IC);
   CheckVectorICCleared(f, 0);
-  CHECK(ic_after->ic_state() == DEFAULT);
 }
 
 
@@ -3890,17 +3882,13 @@ TEST(IncrementalMarkingPreservesPolymorphicIC) {
   Handle<JSFunction> f = Handle<JSFunction>::cast(v8::Utils::OpenHandle(
       *v8::Handle<v8::Function>::Cast(CcTest::global()->Get(v8_str("f")))));
 
-  Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC);
   CheckVectorIC(f, 0, POLYMORPHIC);
-  CHECK(ic_before->ic_state() == DEFAULT);
 
   // Fire context dispose notification.
   SimulateIncrementalMarking(CcTest::heap());
   CcTest::heap()->CollectAllGarbage();
 
-  Code* ic_after = FindFirstIC(f->shared()->code(), Code::LOAD_IC);
   CheckVectorIC(f, 0, POLYMORPHIC);
-  CHECK(ic_after->ic_state() == DEFAULT);
 }
 
 
@@ -3930,9 +3918,7 @@ TEST(IncrementalMarkingClearsPolymorphicIC) {
   Handle<JSFunction> f = Handle<JSFunction>::cast(v8::Utils::OpenHandle(
       *v8::Handle<v8::Function>::Cast(CcTest::global()->Get(v8_str("f")))));
 
-  Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC);
   CheckVectorIC(f, 0, POLYMORPHIC);
-  CHECK(ic_before->ic_state() == DEFAULT);
 
   // Fire context dispose notification.
   CcTest::isolate()->ContextDisposedNotification();
@@ -3940,7 +3926,6 @@ TEST(IncrementalMarkingClearsPolymorphicIC) {
   CcTest::heap()->CollectAllGarbage();
 
   CheckVectorICCleared(f, 0);
-  CHECK(ic_before->ic_state() == DEFAULT);
 }