diff options
Diffstat (limited to 'runtime/base/mutex.h')
| -rw-r--r-- | runtime/base/mutex.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index 3f2c5a9e74..74b786c38e 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h @@ -79,7 +79,6 @@ enum LockLevel { kAllocSpaceLock, kBumpPointerSpaceBlockLock, kArenaPoolLock, - kDexFileToMethodInlinerMapLock, kInternTableLock, kOatFileSecondaryLookupLock, kHostDlOpenHandlesLock, @@ -92,12 +91,10 @@ enum LockLevel { kDefaultMutexLevel, kDexLock, kMarkSweepLargeObjectLock, - kPinTableLock, kJdwpObjectRegistryLock, kModifyLdtLock, kAllocatedThreadIdsLock, kMonitorPoolLock, - kMethodVerifiersLock, kClassLinkerClassesLock, // TODO rename. kJitCodeCacheLock, kBreakpointLock, @@ -630,12 +627,9 @@ class Locks { // TODO: improve name, perhaps instrumentation_update_lock_. static Mutex* deoptimization_lock_ ACQUIRED_AFTER(alloc_tracker_lock_); - // Guards String initializer register map in interpreter. - static Mutex* interpreter_string_init_map_lock_ ACQUIRED_AFTER(deoptimization_lock_); - // The thread_list_lock_ guards ThreadList::list_. It is also commonly held to stop threads // attaching and detaching. - static Mutex* thread_list_lock_ ACQUIRED_AFTER(interpreter_string_init_map_lock_); + static Mutex* thread_list_lock_ ACQUIRED_AFTER(deoptimization_lock_); // Signaled when threads terminate. Used to determine when all non-daemons have terminated. static ConditionVariable* thread_exit_cond_ GUARDED_BY(Locks::thread_list_lock_); |