| Index: test/cctest/test-heap.cc
|
| diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
|
| index 8a8df2990457f9d13ff95ea2ae3ee402d123452c..0eaf937e59b1ce06ff6346170537e2b125b2a7c0 100644
|
| --- a/test/cctest/test-heap.cc
|
| +++ b/test/cctest/test-heap.cc
|
| @@ -2833,8 +2833,7 @@ TEST(IncrementalMarkingClearsTypeFeedbackCells) {
|
| static Code* FindFirstIC(Code* code, Code::Kind kind) {
|
| int mask = RelocInfo::ModeMask(RelocInfo::CODE_TARGET) |
|
| RelocInfo::ModeMask(RelocInfo::CONSTRUCT_CALL) |
|
| - RelocInfo::ModeMask(RelocInfo::CODE_TARGET_WITH_ID) |
|
| - RelocInfo::ModeMask(RelocInfo::CODE_TARGET_CONTEXT);
|
| + RelocInfo::ModeMask(RelocInfo::CODE_TARGET_WITH_ID);
|
| for (RelocIterator it(code, mask); !it.done(); it.next()) {
|
| RelocInfo* info = it.rinfo();
|
| Code* target = Code::GetCodeFromTargetAddress(info->target_address());
|
| @@ -2846,7 +2845,7 @@ static Code* FindFirstIC(Code* code, Code::Kind kind) {
|
| }
|
|
|
|
|
| -TEST(IncrementalMarkingPreservesMonomorhpicIC) {
|
| +TEST(IncrementalMarkingPreservesMonomorphicIC) {
|
| if (i::FLAG_always_opt) return;
|
| CcTest::InitializeVM();
|
| v8::HandleScope scope(CcTest::isolate());
|
| @@ -2871,7 +2870,7 @@ TEST(IncrementalMarkingPreservesMonomorhpicIC) {
|
| }
|
|
|
|
|
| -TEST(IncrementalMarkingClearsMonomorhpicIC) {
|
| +TEST(IncrementalMarkingClearsMonomorphicIC) {
|
| if (i::FLAG_always_opt) return;
|
| CcTest::InitializeVM();
|
| v8::HandleScope scope(CcTest::isolate());
|
| @@ -2905,7 +2904,7 @@ TEST(IncrementalMarkingClearsMonomorhpicIC) {
|
| }
|
|
|
|
|
| -TEST(IncrementalMarkingClearsPolymorhpicIC) {
|
| +TEST(IncrementalMarkingClearsPolymorphicIC) {
|
| if (i::FLAG_always_opt) return;
|
| CcTest::InitializeVM();
|
| v8::HandleScope scope(CcTest::isolate());
|
| @@ -3054,7 +3053,7 @@ TEST(Regression144230) {
|
| HandleScope inner_scope(isolate);
|
| AlwaysAllocateScope always_allocate;
|
| SimulateFullSpace(heap->code_space());
|
| - isolate->stub_cache()->ComputeCallInitialize(9, RelocInfo::CODE_TARGET);
|
| + isolate->stub_cache()->ComputeCallInitialize(9, NOT_CONTEXTUAL);
|
| }
|
|
|
| // Second compile a CallIC and execute it once so that it gets patched to
|
|
|