| Index: test/cctest/test-heap.cc
|
| diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
|
| index 2e285916079f61528887345627c52b2d656e0168..ac121e059fe9a313e921d656918281da96d105eb 100644
|
| --- a/test/cctest/test-heap.cc
|
| +++ b/test/cctest/test-heap.cc
|
| @@ -3189,20 +3189,18 @@ TEST(IncrementalMarkingClearsTypeFeedbackInfo) {
|
|
|
| Handle<TypeFeedbackVector> feedback_vector(f->shared()->feedback_vector());
|
|
|
| - int expected_length = FLAG_vector_ics ? 4 : 2;
|
| - CHECK_EQ(expected_length, feedback_vector->length());
|
| - for (int i = 0; i < expected_length; i++) {
|
| - if ((i % 2) == 1) {
|
| - CHECK(feedback_vector->get(i)->IsJSFunction());
|
| - }
|
| + int expected_slots = 2;
|
| + CHECK_EQ(expected_slots, feedback_vector->ICSlots());
|
| + for (int i = 0; i < expected_slots; i++) {
|
| + CHECK(feedback_vector->Get(FeedbackVectorICSlot(i))->IsJSFunction());
|
| }
|
|
|
| SimulateIncrementalMarking(CcTest::heap());
|
| CcTest::heap()->CollectAllGarbage(Heap::kNoGCFlags);
|
|
|
| - CHECK_EQ(expected_length, feedback_vector->length());
|
| - for (int i = 0; i < expected_length; i++) {
|
| - CHECK_EQ(feedback_vector->get(i),
|
| + CHECK_EQ(expected_slots, feedback_vector->ICSlots());
|
| + for (int i = 0; i < expected_slots; i++) {
|
| + CHECK_EQ(feedback_vector->Get(FeedbackVectorICSlot(i)),
|
| *TypeFeedbackVector::UninitializedSentinel(CcTest::i_isolate()));
|
| }
|
| }
|
| @@ -4312,8 +4310,8 @@ TEST(WeakCell) {
|
| CHECK(weak_cell1->value()->IsFixedArray());
|
| CHECK_EQ(*survivor, weak_cell2->value());
|
| heap->CollectAllAvailableGarbage();
|
| + CHECK(weak_cell1->cleared());
|
| CHECK_EQ(*survivor, weak_cell2->value());
|
| - CHECK(weak_cell2->value()->IsFixedArray());
|
| }
|
|
|
|
|
| @@ -4344,7 +4342,7 @@ TEST(WeakCellsWithIncrementalMarking) {
|
| heap->CollectAllGarbage(Heap::kNoGCFlags);
|
| CHECK_EQ(*survivor, weak_cells[0]->value());
|
| for (int i = 1; i < N; i++) {
|
| - CHECK(weak_cells[i]->value()->IsUndefined());
|
| + CHECK(weak_cells[i]->cleared());
|
| }
|
| }
|
|
|
|
|