From c6ea7d00ad069a2736f603daa3d8eaa9a1f8ea11 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 1 Feb 2017 16:46:28 -0800 Subject: ART: Clean up art_method.h Clean up the header. Fix up other headers including the -inl file, in an effort to prune the include graph. Fix broken transitive includes by making includes explicit. Introduce new -inl files for method handles and reference visiting. Test: source build/envsetup.sh && lunch aosp_angler-userdebug && mmma art Test: source build/envsetup.sh && lunch aosp_mips64-userdebug && mmma art Change-Id: I8f60f1160c2a702fdf3598149dae38f6fa6bc851 --- runtime/entrypoints/entrypoint_utils-inl.h | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'runtime/entrypoints/entrypoint_utils-inl.h') diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h index ba8cec3a52..caf2e5dfee 100644 --- a/runtime/entrypoints/entrypoint_utils-inl.h +++ b/runtime/entrypoints/entrypoint_utils-inl.h @@ -779,9 +779,32 @@ inline mirror::Class* ResolveVerifyAndClinit(dex::TypeIndex type_idx, return h_class.Get(); } +static inline mirror::String* ResolveString(ClassLinker* class_linker, + dex::StringIndex string_idx, + ArtMethod* referrer) + REQUIRES_SHARED(Locks::mutator_lock_) { + Thread::PoisonObjectPointersIfDebug(); + ObjPtr string = referrer->GetDexCache()->GetResolvedString(string_idx); + if (UNLIKELY(string == nullptr)) { + StackHandleScope<1> hs(Thread::Current()); + Handle dex_cache(hs.NewHandle(referrer->GetDexCache())); + const DexFile& dex_file = *dex_cache->GetDexFile(); + string = class_linker->ResolveString(dex_file, string_idx, dex_cache); + } + return string.Ptr(); +} + inline mirror::String* ResolveStringFromCode(ArtMethod* referrer, dex::StringIndex string_idx) { - ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); - return class_linker->ResolveString(string_idx, referrer); + Thread::PoisonObjectPointersIfDebug(); + ObjPtr string = referrer->GetDexCache()->GetResolvedString(string_idx); + if (UNLIKELY(string == nullptr)) { + StackHandleScope<1> hs(Thread::Current()); + Handle dex_cache(hs.NewHandle(referrer->GetDexCache())); + const DexFile& dex_file = *dex_cache->GetDexFile(); + ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); + string = class_linker->ResolveString(dex_file, string_idx, dex_cache); + } + return string.Ptr(); } inline void UnlockJniSynchronizedMethod(jobject locked, Thread* self) { -- cgit v1.2.3-59-g8ed1b