diff options
Diffstat (limited to 'deps/v8/test/cctest/test-mark-compact.cc')
-rw-r--r-- | deps/v8/test/cctest/test-mark-compact.cc | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/deps/v8/test/cctest/test-mark-compact.cc b/deps/v8/test/cctest/test-mark-compact.cc index 27123704b1..18c63b2fd0 100644 --- a/deps/v8/test/cctest/test-mark-compact.cc +++ b/deps/v8/test/cctest/test-mark-compact.cc @@ -194,7 +194,7 @@ TEST(MarkCompactCollector) { Map::cast(HEAP->AllocateMap(JS_OBJECT_TYPE, JSObject::kHeaderSize)->ToObjectChecked()); function->set_initial_map(initial_map); - Isolate::Current()->context()->global()->SetProperty( + Isolate::Current()->context()->global_object()->SetProperty( func_name, function, NONE, kNonStrictMode)->ToObjectChecked(); JSObject* obj = JSObject::cast( @@ -203,8 +203,9 @@ TEST(MarkCompactCollector) { func_name = String::cast(HEAP->LookupAsciiSymbol("theFunction")->ToObjectChecked()); - CHECK(Isolate::Current()->context()->global()->HasLocalProperty(func_name)); - Object* func_value = Isolate::Current()->context()->global()-> + CHECK(Isolate::Current()->context()->global_object()-> + HasLocalProperty(func_name)); + Object* func_value = Isolate::Current()->context()->global_object()-> GetProperty(func_name)->ToObjectChecked(); CHECK(func_value->IsJSFunction()); function = JSFunction::cast(func_value); @@ -212,7 +213,7 @@ TEST(MarkCompactCollector) { obj = JSObject::cast(HEAP->AllocateJSObject(function)->ToObjectChecked()); String* obj_name = String::cast(HEAP->LookupAsciiSymbol("theObject")->ToObjectChecked()); - Isolate::Current()->context()->global()->SetProperty( + Isolate::Current()->context()->global_object()->SetProperty( obj_name, obj, NONE, kNonStrictMode)->ToObjectChecked(); String* prop_name = String::cast(HEAP->LookupAsciiSymbol("theSlot")->ToObjectChecked()); @@ -225,10 +226,11 @@ TEST(MarkCompactCollector) { obj_name = String::cast(HEAP->LookupAsciiSymbol("theObject")->ToObjectChecked()); - CHECK(Isolate::Current()->context()->global()->HasLocalProperty(obj_name)); - CHECK(Isolate::Current()->context()->global()-> + CHECK(Isolate::Current()->context()->global_object()-> + HasLocalProperty(obj_name)); + CHECK(Isolate::Current()->context()->global_object()-> GetProperty(obj_name)->ToObjectChecked()->IsJSObject()); - obj = JSObject::cast(Isolate::Current()->context()->global()-> + obj = JSObject::cast(Isolate::Current()->context()->global_object()-> GetProperty(obj_name)->ToObjectChecked()); prop_name = String::cast(HEAP->LookupAsciiSymbol("theSlot")->ToObjectChecked()); @@ -526,7 +528,10 @@ static intptr_t MemoryInUse() { TEST(BootUpMemoryUse) { intptr_t initial_memory = MemoryInUse(); - FLAG_crankshaft = false; // Avoid flakiness. + // Avoid flakiness. + FLAG_crankshaft = false; + FLAG_parallel_recompilation = false; + // Only Linux has the proc filesystem and only if it is mapped. If it's not // there we just skip the test. if (initial_memory >= 0) { |