diff options
| author | 2017-02-01 15:43:05 +0000 | |
|---|---|---|
| committer | 2017-02-01 15:43:06 +0000 | |
| commit | 357dcb73934356239292c46d6fbedba734da5e00 (patch) | |
| tree | 8823c6dd4641eae333aa7001203460757a515010 /runtime/class_linker.h | |
| parent | ac240396125911b52437a460a400c8b38be43a96 (diff) | |
| parent | d16363a93053de0f32252c7897d839a46aff14ae (diff) | |
Merge "Revert "Hash-based dex cache type array.""
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 21edd513ac..5042fb7609 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -262,6 +262,10 @@ class ClassLinker { REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Locks::dex_lock_, !Roles::uninterruptible_); + mirror::Class* ResolveType(dex::TypeIndex type_idx, ArtField* referrer) + REQUIRES_SHARED(Locks::mutator_lock_) + REQUIRES(!Locks::dex_lock_, !Roles::uninterruptible_); + // Look up a resolved type with the given ID from the DexFile. The ClassLoader is used to search // for the type, since it may be referenced from but not contained within the given DexFile. ObjPtr<mirror::Class> LookupResolvedType(const DexFile& dex_file, @@ -269,10 +273,6 @@ class ClassLinker { ObjPtr<mirror::DexCache> dex_cache, ObjPtr<mirror::ClassLoader> class_loader) REQUIRES_SHARED(Locks::mutator_lock_); - static ObjPtr<mirror::Class> LookupResolvedType(dex::TypeIndex type_idx, - ObjPtr<mirror::DexCache> dex_cache, - ObjPtr<mirror::ClassLoader> class_loader) - REQUIRES_SHARED(Locks::mutator_lock_); // Resolve a type with the given ID from the DexFile, storing the // result in DexCache. The ClassLoader is used to search for the |