diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-01-05 18:16:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-05 18:16:15 +0000 |
| commit | 16722603e0f0ef286085fbe9b2cbe9ccad86bfef (patch) | |
| tree | 2dbee5e5b5a5b068c0e16f1602608388555a51b8 /runtime/class_linker-inl.h | |
| parent | f67dadb5550ee2bd9db0b7b0b75d8c44ddf170d2 (diff) | |
| parent | dba61481035b7944173181ec9ee02aea41dd0e29 (diff) | |
| download | art-16722603e0f0ef286085fbe9b2cbe9ccad86bfef.tar.gz art-16722603e0f0ef286085fbe9b2cbe9ccad86bfef.tar.bz2 art-16722603e0f0ef286085fbe9b2cbe9ccad86bfef.zip | |
Merge "Revert "Revert "Revert "Revert "Basic obsolete methods support"""""
Diffstat (limited to 'runtime/class_linker-inl.h')
| -rw-r--r-- | runtime/class_linker-inl.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/runtime/class_linker-inl.h b/runtime/class_linker-inl.h index cdcc84ddc3..5fc5f1a2f5 100644 --- a/runtime/class_linker-inl.h +++ b/runtime/class_linker-inl.h @@ -189,20 +189,15 @@ inline ArtField* ClassLinker::GetResolvedField(uint32_t field_idx, return dex_cache->GetResolvedField(field_idx, image_pointer_size_); } -inline ArtField* ClassLinker::GetResolvedField(uint32_t field_idx, - ObjPtr<mirror::Class> field_declaring_class) { - return GetResolvedField(field_idx, MakeObjPtr(field_declaring_class->GetDexCache())); -} - inline ArtField* ClassLinker::ResolveField(uint32_t field_idx, ArtMethod* referrer, bool is_static) { Thread::PoisonObjectPointersIfDebug(); ObjPtr<mirror::Class> declaring_class = referrer->GetDeclaringClass(); - ArtField* resolved_field = GetResolvedField(field_idx, declaring_class); + ArtField* resolved_field = GetResolvedField(field_idx, referrer->GetDexCache()); if (UNLIKELY(resolved_field == nullptr)) { StackHandleScope<2> hs(Thread::Current()); - Handle<mirror::DexCache> dex_cache(hs.NewHandle(declaring_class->GetDexCache())); + Handle<mirror::DexCache> dex_cache(hs.NewHandle(referrer->GetDexCache())); Handle<mirror::ClassLoader> class_loader(hs.NewHandle(declaring_class->GetClassLoader())); const DexFile& dex_file = *dex_cache->GetDexFile(); resolved_field = ResolveField(dex_file, field_idx, dex_cache, class_loader, is_static); |