diff options
| -rw-r--r-- | runtime/gc/collector/mark_sweep.cc | 2 | ||||
| -rw-r--r-- | runtime/gc/collector/mark_sweep.h | 2 | ||||
| -rw-r--r-- | runtime/locks.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc index 30c295b5ae..2f68f8e1c7 100644 --- a/runtime/gc/collector/mark_sweep.cc +++ b/runtime/gc/collector/mark_sweep.cc @@ -144,7 +144,7 @@ MarkSweep::MarkSweep(Heap* heap, bool is_concurrent, const std::string& name_pre cleared_reference_list_(NULL), gc_barrier_(new Barrier(0)), large_object_lock_("mark sweep large object lock", kMarkSweepLargeObjectLock), - mark_stack_lock_("mark sweep mark stack lock"), + mark_stack_lock_("mark sweep mark stack lock", kMarkSweepMarkStackLock), is_concurrent_(is_concurrent), clear_soft_references_(false) { } diff --git a/runtime/gc/collector/mark_sweep.h b/runtime/gc/collector/mark_sweep.h index d5f4042db8..fdd0c86724 100644 --- a/runtime/gc/collector/mark_sweep.h +++ b/runtime/gc/collector/mark_sweep.h @@ -446,7 +446,7 @@ class MarkSweep : public GarbageCollector { UniquePtr<Barrier> gc_barrier_; Mutex large_object_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER; - Mutex mark_stack_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER; + Mutex mark_stack_lock_ ACQUIRED_AFTER(Locks::classlinker_classes_lock_); const bool is_concurrent_; diff --git a/runtime/locks.h b/runtime/locks.h index 88d05db0cb..f63e2b1720 100644 --- a/runtime/locks.h +++ b/runtime/locks.h @@ -38,6 +38,7 @@ enum LockLevel { kAbortLock, kJdwpSocketLock, kAllocSpaceLock, + kMarkSweepMarkStackLock, kDefaultMutexLevel, kMarkSweepLargeObjectLock, kPinTableLock, |