diff options
Diffstat (limited to 'runtime/runtime.h')
| -rw-r--r-- | runtime/runtime.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h index 4cddb5c255..d54972c7a6 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -456,9 +456,10 @@ class Runtime { return use_compile_time_class_path_; } - void AddMethodVerifier(verifier::MethodVerifier* verifier) LOCKS_EXCLUDED(method_verifier_lock_); + void AddMethodVerifier(verifier::MethodVerifier* verifier) + LOCKS_EXCLUDED(Locks::method_verifiers_lock_); void RemoveMethodVerifier(verifier::MethodVerifier* verifier) - LOCKS_EXCLUDED(method_verifier_lock_); + LOCKS_EXCLUDED(Locks::method_verifiers_lock_); const std::vector<const DexFile*>& GetCompileTimeClassPath(jobject class_loader); @@ -642,8 +643,7 @@ class Runtime { std::string fault_message_ GUARDED_BY(fault_message_lock_); // Method verifier set, used so that we can update their GC roots. - Mutex method_verifier_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER; - std::set<verifier::MethodVerifier*> method_verifiers_; + std::set<verifier::MethodVerifier*> method_verifiers_ GUARDED_BY(Locks::method_verifiers_lock_); // A non-zero value indicates that a thread has been created but not yet initialized. Guarded by // the shutdown lock so that threads aren't born while we're shutting down. |