diff options
| author | Ian Rogers <irogers@google.com> | 2014-04-28 16:47:08 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-04-29 14:36:28 -0700 |
| commit | b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf (patch) | |
| tree | 839d13ebfa7170967dd9b4abd434b7abda53da99 /runtime/class_linker.h | |
| parent | 948740c1938860df055ddc801f20fd1707331e38 (diff) | |
| download | art-b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf.zip art-b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf.tar.gz art-b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf.tar.bz2 | |
Force inlining on trivial accessors.
Make volatility for GetFieldObject a template parameter.
Move some trivial mirror::String routines to a -inl.h.
Bug: 14285442
Change-Id: Ie23b11d4f18cb15a62c3bbb42837a8aaf6b68f92
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 9771318..a23add0 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -251,7 +251,7 @@ class ClassLinker { LOCKS_EXCLUDED(dex_lock_) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); bool IsDexFileRegistered(const DexFile& dex_file) const - LOCKS_EXCLUDED(dex_lock_); + LOCKS_EXCLUDED(dex_lock_) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void FixupDexCaches(mirror::ArtMethod* resolution_method) const LOCKS_EXCLUDED(dex_lock_) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); @@ -462,7 +462,8 @@ class ClassLinker { void RegisterDexFileLocked(const DexFile& dex_file, const SirtRef<mirror::DexCache>& dex_cache) EXCLUSIVE_LOCKS_REQUIRED(dex_lock_) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - bool IsDexFileRegisteredLocked(const DexFile& dex_file) const SHARED_LOCKS_REQUIRED(dex_lock_); + bool IsDexFileRegisteredLocked(const DexFile& dex_file) const + SHARED_LOCKS_REQUIRED(dex_lock_, Locks::mutator_lock_); bool InitializeClass(const SirtRef<mirror::Class>& klass, bool can_run_clinit, bool can_init_parents) |