Index: test/cctest/test-heap.cc |
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc |
index d8c89aec1b4b242a9702c3a018681bdb9b2569bc..3f5ccafc522d560da848e7d2124e3509b455f72c 100644 |
--- a/test/cctest/test-heap.cc |
+++ b/test/cctest/test-heap.cc |
@@ -3346,10 +3346,10 @@ TEST(IncrementalMarkingPreservesMonomorphicCallIC) { |
Handle<TypeFeedbackVector> feedback_vector(f->shared()->feedback_vector()); |
- int expected_slots = 2; |
+ int expected_slots = 3; |
CHECK_EQ(expected_slots, feedback_vector->ICSlots()); |
- int slot1 = 0; |
- int slot2 = 1; |
+ int slot1 = 1; |
+ int slot2 = 2; |
CHECK(feedback_vector->Get(FeedbackVectorICSlot(slot1))->IsWeakCell()); |
CHECK(feedback_vector->Get(FeedbackVectorICSlot(slot2))->IsWeakCell()); |
@@ -3473,7 +3473,7 @@ TEST(IncrementalMarkingPreservesMonomorphicIC) { |
Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
if (FLAG_vector_ics) { |
- CheckVectorIC(f, 0, MONOMORPHIC); |
+ CheckVectorIC(f, 1, MONOMORPHIC); |
CHECK(ic_before->ic_state() == DEFAULT); |
} else { |
CHECK(ic_before->ic_state() == MONOMORPHIC); |
@@ -3484,7 +3484,7 @@ TEST(IncrementalMarkingPreservesMonomorphicIC) { |
Code* ic_after = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
if (FLAG_vector_ics) { |
- CheckVectorIC(f, 0, MONOMORPHIC); |
+ CheckVectorIC(f, 1, MONOMORPHIC); |
CHECK(ic_after->ic_state() == DEFAULT); |
} else { |
CHECK(ic_after->ic_state() == MONOMORPHIC); |
@@ -3513,7 +3513,7 @@ TEST(IncrementalMarkingClearsMonomorphicIC) { |
Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
if (FLAG_vector_ics) { |
- CheckVectorIC(f, 0, MONOMORPHIC); |
+ CheckVectorIC(f, 1, MONOMORPHIC); |
CHECK(ic_before->ic_state() == DEFAULT); |
} else { |
CHECK(ic_before->ic_state() == MONOMORPHIC); |
@@ -3526,7 +3526,7 @@ TEST(IncrementalMarkingClearsMonomorphicIC) { |
Code* ic_after = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
if (FLAG_vector_ics) { |
- CheckVectorICCleared(f, 0); |
+ CheckVectorICCleared(f, 1); |
CHECK(ic_after->ic_state() == DEFAULT); |
} else { |
CHECK(IC::IsCleared(ic_after)); |
@@ -3562,7 +3562,7 @@ TEST(IncrementalMarkingPreservesPolymorphicIC) { |
Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
if (FLAG_vector_ics) { |
- CheckVectorIC(f, 0, POLYMORPHIC); |
+ CheckVectorIC(f, 1, POLYMORPHIC); |
CHECK(ic_before->ic_state() == DEFAULT); |
} else { |
CHECK(ic_before->ic_state() == POLYMORPHIC); |
@@ -3574,7 +3574,7 @@ TEST(IncrementalMarkingPreservesPolymorphicIC) { |
Code* ic_after = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
if (FLAG_vector_ics) { |
- CheckVectorIC(f, 0, POLYMORPHIC); |
+ CheckVectorIC(f, 1, POLYMORPHIC); |
CHECK(ic_after->ic_state() == DEFAULT); |
} else { |
CHECK(ic_after->ic_state() == POLYMORPHIC); |
@@ -3610,7 +3610,7 @@ TEST(IncrementalMarkingClearsPolymorphicIC) { |
Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
if (FLAG_vector_ics) { |
- CheckVectorIC(f, 0, POLYMORPHIC); |
+ CheckVectorIC(f, 1, POLYMORPHIC); |
CHECK(ic_before->ic_state() == DEFAULT); |
} else { |
CHECK(ic_before->ic_state() == POLYMORPHIC); |
@@ -3623,7 +3623,7 @@ TEST(IncrementalMarkingClearsPolymorphicIC) { |
Code* ic_after = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
if (FLAG_vector_ics) { |
- CheckVectorICCleared(f, 0); |
+ CheckVectorICCleared(f, 1); |
CHECK(ic_before->ic_state() == DEFAULT); |
} else { |
CHECK(IC::IsCleared(ic_after)); |
@@ -4777,12 +4777,12 @@ TEST(MonomorphicStaysMonomorphicAfterGC) { |
CompileRun("(testIC())"); |
} |
heap->CollectAllGarbage(); |
- CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 0, MONOMORPHIC); |
+ CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 1, MONOMORPHIC); |
{ |
v8::HandleScope scope(CcTest::isolate()); |
CompileRun("(testIC())"); |
} |
- CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 0, MONOMORPHIC); |
+ CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 1, MONOMORPHIC); |
} |
@@ -4813,12 +4813,12 @@ TEST(PolymorphicStaysPolymorphicAfterGC) { |
CompileRun("(testIC())"); |
} |
heap->CollectAllGarbage(); |
- CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 0, POLYMORPHIC); |
+ CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 1, POLYMORPHIC); |
{ |
v8::HandleScope scope(CcTest::isolate()); |
CompileRun("(testIC())"); |
} |
- CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 0, POLYMORPHIC); |
+ CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 1, POLYMORPHIC); |
} |