diff options
Diffstat (limited to 'runtime/class_linker-inl.h')
| -rw-r--r-- | runtime/class_linker-inl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/class_linker-inl.h b/runtime/class_linker-inl.h index d6f003027b..648b455e50 100644 --- a/runtime/class_linker-inl.h +++ b/runtime/class_linker-inl.h @@ -73,7 +73,8 @@ inline ObjPtr<mirror::Class> ClassLinker::LookupResolvedType( return type; } -inline mirror::Class* ClassLinker::ResolveType(dex::TypeIndex type_idx, ArtMethod* referrer) { +inline ObjPtr<mirror::Class> ClassLinker::ResolveType(dex::TypeIndex type_idx, + ArtMethod* referrer) { Thread::PoisonObjectPointersIfDebug(); if (kIsDebugBuild) { Thread::Current()->AssertNoPendingException(); @@ -87,7 +88,7 @@ inline mirror::Class* ClassLinker::ResolveType(dex::TypeIndex type_idx, ArtMetho const DexFile& dex_file = *dex_cache->GetDexFile(); resolved_type = ResolveType(dex_file, type_idx, dex_cache, class_loader); } - return resolved_type.Ptr(); + return resolved_type; } template <bool kThrowOnError, typename ClassGetter> |