diff options
Diffstat (limited to 'src/3rdparty/v8/test/cctest/test-mark-compact.cc')
-rw-r--r-- | src/3rdparty/v8/test/cctest/test-mark-compact.cc | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/3rdparty/v8/test/cctest/test-mark-compact.cc b/src/3rdparty/v8/test/cctest/test-mark-compact.cc index 700f322..c0ab763 100644 --- a/src/3rdparty/v8/test/cctest/test-mark-compact.cc +++ b/src/3rdparty/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,23 +528,26 @@ 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) { InitializeVM(); - intptr_t booted_memory = MemoryInUse(); + intptr_t delta = MemoryInUse() - initial_memory; if (sizeof(initial_memory) == 8) { if (v8::internal::Snapshot::IsEnabled()) { - CHECK_LE(booted_memory - initial_memory, 3600 * 1024); // 3396. + CHECK_LE(delta, 3600 * 1024); // 3396. } else { - CHECK_LE(booted_memory - initial_memory, 3600 * 1024); // 3432. + CHECK_LE(delta, 4000 * 1024); // 3948. } } else { if (v8::internal::Snapshot::IsEnabled()) { - CHECK_LE(booted_memory - initial_memory, 2800 * 1024); // 2484. + CHECK_LE(delta, 2500 * 1024); // 2400. } else { - CHECK_LE(booted_memory - initial_memory, 2950 * 1024); // 2844 + CHECK_LE(delta, 2860 * 1024); // 2760. } } } |