Index: test/cctest/test-heap.cc |
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc |
index a885c4ac03ca60172e8003ab0c662696da950026..eb23ad79f2e386699a76ed3af6dc88e2520c8dd6 100644 |
--- a/test/cctest/test-heap.cc |
+++ b/test/cctest/test-heap.cc |
@@ -3587,10 +3587,10 @@ TEST(IncrementalMarkingPreservesMonomorphicCallIC) { |
Handle<TypeFeedbackVector> feedback_vector(f->shared()->feedback_vector()); |
- int expected_slots = 3; |
+ int expected_slots = 2; |
CHECK_EQ(expected_slots, feedback_vector->ICSlots()); |
- int slot1 = 1; |
- int slot2 = 2; |
+ int slot1 = 0; |
+ int slot2 = 1; |
CHECK(feedback_vector->Get(FeedbackVectorICSlot(slot1))->IsWeakCell()); |
CHECK(feedback_vector->Get(FeedbackVectorICSlot(slot2))->IsWeakCell()); |
@@ -3713,14 +3713,14 @@ TEST(IncrementalMarkingPreservesMonomorphicIC) { |
CcTest::global()->Get(v8_str("f")))); |
Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
- CheckVectorIC(f, 1, MONOMORPHIC); |
+ 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, 1, MONOMORPHIC); |
+ CheckVectorIC(f, 0, MONOMORPHIC); |
CHECK(ic_after->ic_state() == DEFAULT); |
} |
@@ -3745,7 +3745,7 @@ TEST(IncrementalMarkingClearsMonomorphicIC) { |
*v8::Handle<v8::Function>::Cast(CcTest::global()->Get(v8_str("f")))); |
Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
- CheckVectorIC(f, 1, MONOMORPHIC); |
+ CheckVectorIC(f, 0, MONOMORPHIC); |
CHECK(ic_before->ic_state() == DEFAULT); |
// Fire context dispose notification. |
@@ -3754,7 +3754,7 @@ TEST(IncrementalMarkingClearsMonomorphicIC) { |
CcTest::heap()->CollectAllGarbage(); |
Code* ic_after = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
- CheckVectorICCleared(f, 1); |
+ CheckVectorICCleared(f, 0); |
CHECK(ic_after->ic_state() == DEFAULT); |
} |
@@ -3786,7 +3786,7 @@ TEST(IncrementalMarkingPreservesPolymorphicIC) { |
*v8::Handle<v8::Function>::Cast(CcTest::global()->Get(v8_str("f")))); |
Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
- CheckVectorIC(f, 1, POLYMORPHIC); |
+ CheckVectorIC(f, 0, POLYMORPHIC); |
CHECK(ic_before->ic_state() == DEFAULT); |
// Fire context dispose notification. |
@@ -3794,7 +3794,7 @@ TEST(IncrementalMarkingPreservesPolymorphicIC) { |
CcTest::heap()->CollectAllGarbage(); |
Code* ic_after = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
- CheckVectorIC(f, 1, POLYMORPHIC); |
+ CheckVectorIC(f, 0, POLYMORPHIC); |
CHECK(ic_after->ic_state() == DEFAULT); |
} |
@@ -3826,7 +3826,7 @@ TEST(IncrementalMarkingClearsPolymorphicIC) { |
*v8::Handle<v8::Function>::Cast(CcTest::global()->Get(v8_str("f")))); |
Code* ic_before = FindFirstIC(f->shared()->code(), Code::LOAD_IC); |
- CheckVectorIC(f, 1, POLYMORPHIC); |
+ CheckVectorIC(f, 0, POLYMORPHIC); |
CHECK(ic_before->ic_state() == DEFAULT); |
// Fire context dispose notification. |
@@ -3834,7 +3834,7 @@ TEST(IncrementalMarkingClearsPolymorphicIC) { |
SimulateIncrementalMarking(CcTest::heap()); |
CcTest::heap()->CollectAllGarbage(); |
- CheckVectorICCleared(f, 1); |
+ CheckVectorICCleared(f, 0); |
CHECK(ic_before->ic_state() == DEFAULT); |
} |
@@ -4983,12 +4983,12 @@ TEST(MonomorphicStaysMonomorphicAfterGC) { |
CompileRun("(testIC())"); |
} |
heap->CollectAllGarbage(); |
- CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 1, MONOMORPHIC); |
+ CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 0, MONOMORPHIC); |
{ |
v8::HandleScope scope(CcTest::isolate()); |
CompileRun("(testIC())"); |
} |
- CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 1, MONOMORPHIC); |
+ CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 0, MONOMORPHIC); |
} |
@@ -5019,12 +5019,12 @@ TEST(PolymorphicStaysPolymorphicAfterGC) { |
CompileRun("(testIC())"); |
} |
heap->CollectAllGarbage(); |
- CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 1, POLYMORPHIC); |
+ CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 0, POLYMORPHIC); |
{ |
v8::HandleScope scope(CcTest::isolate()); |
CompileRun("(testIC())"); |
} |
- CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 1, POLYMORPHIC); |
+ CheckIC(loadIC->code(), Code::LOAD_IC, loadIC->shared(), 0, POLYMORPHIC); |
} |