diff --git a/runtime/tests/vm/dart/splay_test.dart b/runtime/tests/vm/dart/splay_test.dart index 0e5ee189cb9..0df396ba5a6 100644 --- a/runtime/tests/vm/dart/splay_test.dart +++ b/runtime/tests/vm/dart/splay_test.dart @@ -9,30 +9,30 @@ // objects, and between marked and unmarked objects. // VMOptions= -// VMOptions=--no_concurrent_mark --no_concurrent_sweep -// VMOptions=--no_concurrent_mark --concurrent_sweep -// VMOptions=--no_concurrent_mark --use_compactor -// VMOptions=--no_concurrent_mark --use_compactor --force_evacuation -// VMOptions=--concurrent_mark --no_concurrent_sweep -// VMOptions=--concurrent_mark --concurrent_sweep -// VMOptions=--concurrent_mark --use_compactor -// VMOptions=--concurrent_mark --use_compactor --force_evacuation -// VMOptions=--scavenger_tasks=0 -// VMOptions=--scavenger_tasks=1 -// VMOptions=--scavenger_tasks=2 -// VMOptions=--scavenger_tasks=3 -// VMOptions=--verify_before_gc -// VMOptions=--verify_after_gc -// VMOptions=--verify_before_gc --verify_after_gc -// VMOptions=--verify_store_buffer -// VMOptions=--verify_after_marking -// VMOptions=--stress_write_barrier_elimination -// VMOptions=--old_gen_heap_size=100 -// VMOptions=--mark_when_idle -// VMOptions=--no_load_cse -// VMOptions=--no_dead_store_elimination -// VMOptions=--no_load_cse --no_dead_store_elimination -// VMOptions=--test_il_serialization +// VMOptions=--profiler --no_concurrent_mark --no_concurrent_sweep +// VMOptions=--profiler --no_concurrent_mark --concurrent_sweep +// VMOptions=--profiler --no_concurrent_mark --use_compactor +// VMOptions=--profiler --no_concurrent_mark --use_compactor --force_evacuation +// VMOptions=--profiler --concurrent_mark --no_concurrent_sweep +// VMOptions=--profiler --concurrent_mark --concurrent_sweep +// VMOptions=--profiler --concurrent_mark --use_compactor +// VMOptions=--profiler --concurrent_mark --use_compactor --force_evacuation +// VMOptions=--profiler --scavenger_tasks=0 +// VMOptions=--profiler --scavenger_tasks=1 +// VMOptions=--profiler --scavenger_tasks=2 +// VMOptions=--profiler --scavenger_tasks=3 +// VMOptions=--profiler --verify_before_gc +// VMOptions=--profiler --verify_after_gc +// VMOptions=--profiler --verify_before_gc --verify_after_gc +// VMOptions=--profiler --verify_store_buffer +// VMOptions=--profiler --verify_after_marking +// VMOptions=--profiler --stress_write_barrier_elimination +// VMOptions=--profiler --old_gen_heap_size=100 +// VMOptions=--profiler --mark_when_idle +// VMOptions=--profiler --no_load_cse +// VMOptions=--profiler --no_dead_store_elimination +// VMOptions=--profiler --no_load_cse --no_dead_store_elimination +// VMOptions=--profiler --test_il_serialization import "splay_common.dart"; diff --git a/runtime/tests/vm/dart_2/splay_test.dart b/runtime/tests/vm/dart_2/splay_test.dart index 18cfe108023..f3b8da4978e 100644 --- a/runtime/tests/vm/dart_2/splay_test.dart +++ b/runtime/tests/vm/dart_2/splay_test.dart @@ -13,30 +13,30 @@ // @dart=2.9 // VMOptions= -// VMOptions=--no_concurrent_mark --no_concurrent_sweep -// VMOptions=--no_concurrent_mark --concurrent_sweep -// VMOptions=--no_concurrent_mark --use_compactor -// VMOptions=--no_concurrent_mark --use_compactor --force_evacuation -// VMOptions=--concurrent_mark --no_concurrent_sweep -// VMOptions=--concurrent_mark --concurrent_sweep -// VMOptions=--concurrent_mark --use_compactor -// VMOptions=--concurrent_mark --use_compactor --force_evacuation -// VMOptions=--scavenger_tasks=0 -// VMOptions=--scavenger_tasks=1 -// VMOptions=--scavenger_tasks=2 -// VMOptions=--scavenger_tasks=3 -// VMOptions=--verify_before_gc -// VMOptions=--verify_after_gc -// VMOptions=--verify_before_gc --verify_after_gc -// VMOptions=--verify_store_buffer -// VMOptions=--verify_after_marking -// VMOptions=--stress_write_barrier_elimination -// VMOptions=--old_gen_heap_size=100 -// VMOptions=--mark_when_idle -// VMOptions=--no_load_cse -// VMOptions=--no_dead_store_elimination -// VMOptions=--no_load_cse --no_dead_store_elimination -// VMOptions=--test_il_serialization +// VMOptions=--profiler --no_concurrent_mark --no_concurrent_sweep +// VMOptions=--profiler --no_concurrent_mark --concurrent_sweep +// VMOptions=--profiler --no_concurrent_mark --use_compactor +// VMOptions=--profiler --no_concurrent_mark --use_compactor --force_evacuation +// VMOptions=--profiler --concurrent_mark --no_concurrent_sweep +// VMOptions=--profiler --concurrent_mark --concurrent_sweep +// VMOptions=--profiler --concurrent_mark --use_compactor +// VMOptions=--profiler --concurrent_mark --use_compactor --force_evacuation +// VMOptions=--profiler --scavenger_tasks=0 +// VMOptions=--profiler --scavenger_tasks=1 +// VMOptions=--profiler --scavenger_tasks=2 +// VMOptions=--profiler --scavenger_tasks=3 +// VMOptions=--profiler --verify_before_gc +// VMOptions=--profiler --verify_after_gc +// VMOptions=--profiler --verify_before_gc --verify_after_gc +// VMOptions=--profiler --verify_store_buffer +// VMOptions=--profiler --verify_after_marking +// VMOptions=--profiler --stress_write_barrier_elimination +// VMOptions=--profiler --old_gen_heap_size=100 +// VMOptions=--profiler --mark_when_idle +// VMOptions=--profiler --no_load_cse +// VMOptions=--profiler --no_dead_store_elimination +// VMOptions=--profiler --no_load_cse --no_dead_store_elimination +// VMOptions=--profiler --test_il_serialization import "splay_common.dart"; diff --git a/runtime/vm/heap/pages.cc b/runtime/vm/heap/pages.cc index 61e0f1789d8..24db6f48e45 100644 --- a/runtime/vm/heap/pages.cc +++ b/runtime/vm/heap/pages.cc @@ -1206,10 +1206,8 @@ void PageSpace::ConcurrentSweep(IsolateGroup* isolate_group) { } void PageSpace::Compact(Thread* thread) { - thread->isolate_group()->set_compaction_in_progress(true); GCCompactor compactor(thread, heap_); compactor.Compact(pages_, &freelists_[Page::kData], &pages_lock_); - thread->isolate_group()->set_compaction_in_progress(false); if (FLAG_verify_after_gc) { OS::PrintErr("Verifying after compacting..."); diff --git a/runtime/vm/isolate.h b/runtime/vm/isolate.h index 08ffb1a70a0..f0e8ba5c3f6 100644 --- a/runtime/vm/isolate.h +++ b/runtime/vm/isolate.h @@ -753,14 +753,6 @@ class IsolateGroup : public IntrusiveDListEntry { void VisitObjectIdRingPointers(ObjectPointerVisitor* visitor); void VisitWeakPersistentHandles(HandleVisitor* visitor); - bool compaction_in_progress() const { - return CompactionInProgressBit::decode(isolate_group_flags_); - } - void set_compaction_in_progress(bool value) { - isolate_group_flags_ = - CompactionInProgressBit::update(value, isolate_group_flags_); - } - // In precompilation we finalize all regular classes before compiling. bool all_classes_finalized() const { return AllClassesFinalizedBit::decode(isolate_group_flags_); @@ -807,7 +799,6 @@ class IsolateGroup : public IntrusiveDListEntry { #define ISOLATE_GROUP_FLAG_BITS(V) \ V(AllClassesFinalized) \ - V(CompactionInProgress) \ V(EnableAsserts) \ V(HasAttemptedReload) \ V(NullSafety) \ diff --git a/runtime/vm/object.h b/runtime/vm/object.h index b37ab567928..f0b71be02ab 100644 --- a/runtime/vm/object.h +++ b/runtime/vm/object.h @@ -12933,7 +12933,6 @@ ClassPtr Object::clazz() const { if ((raw_value & kSmiTagMask) == kSmiTag) { return Smi::Class(); } - ASSERT(!IsolateGroup::Current()->compaction_in_progress()); return IsolateGroup::Current()->class_table()->At(ptr()->GetClassId()); } diff --git a/runtime/vm/profiler.cc b/runtime/vm/profiler.cc index d5ed6b3fab1..d6a97239b8b 100644 --- a/runtime/vm/profiler.cc +++ b/runtime/vm/profiler.cc @@ -1533,11 +1533,6 @@ void Profiler::SampleThread(Thread* thread, SampleThreadSingleFrame(thread, sample, pc); return; } - if (isolate->group()->compaction_in_progress()) { - // The Dart stack isn't fully walkable. - SampleThreadSingleFrame(thread, sample, pc); - return; - } } uword stack_lower = 0;