diff options
| author | 2016-10-21 15:30:22 +0000 | |
|---|---|---|
| committer | 2016-10-21 15:30:22 +0000 | |
| commit | 77cd3d861fcf723ba0a37833c223eeb08cfd7d8c (patch) | |
| tree | e4cd7833fe8fec4e4b216e156312a323f23e8f02 /runtime/base/mutex-inl.h | |
| parent | 6c42676b466c4f08cfa6ca43da65bc74f48dc063 (diff) | |
| parent | f42eb2c7801dbb45a6ba20a372d5ba4712ebefba (diff) | |
Merge "Remove mutex dependency on art::Runtime"
Diffstat (limited to 'runtime/base/mutex-inl.h')
| -rw-r--r-- | runtime/base/mutex-inl.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/base/mutex-inl.h b/runtime/base/mutex-inl.h index 1c320243dc..92b7c6537c 100644 --- a/runtime/base/mutex-inl.h +++ b/runtime/base/mutex-inl.h @@ -23,7 +23,6 @@ #include "base/stringprintf.h" #include "base/value_object.h" -#include "runtime.h" #include "thread.h" #include "utils.h" @@ -59,8 +58,7 @@ static inline void CheckUnattachedThread(LockLevel level) NO_THREAD_SAFETY_ANALY // on a thread. Lock checking is disabled to avoid deadlock when checking shutdown lock. // TODO: tighten this check. if (kDebugLocking) { - Runtime* runtime = Runtime::Current(); - CHECK(runtime == nullptr || !runtime->IsStarted() || runtime->IsShuttingDownLocked() || + CHECK(!Locks::IsSafeToCallAbortRacy() || // Used during thread creation to avoid races with runtime shutdown. Thread::Current not // yet established. level == kRuntimeShutdownLock || |