From 85c0f2ac03417f5125bc2ff1dab8109859c67d5c Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 2 Feb 2017 16:42:38 +0000 Subject: Revert^2 "Hash-based dex cache type array." The reason for the revert was fixed by https://android-review.googlesource.com/332666 . We now enable clearing dex cache types in test 155 from that CL. Also avoid an unnecessary store in LookupResolvedTypes() and prevent verifier from messing up the dex cache types. Test: m test-art-host Bug: 34839984 Bug: 30627598 Bug: 34659969 This reverts commit d16363a93053de0f32252c7897d839a46aff14ae. Change-Id: Ie8603cfa772e78e648d005b0b6eae59062ae729d --- runtime/native/java_lang_DexCache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/native/java_lang_DexCache.cc') diff --git a/runtime/native/java_lang_DexCache.cc b/runtime/native/java_lang_DexCache.cc index b1ed74a6de..ee6dda56a5 100644 --- a/runtime/native/java_lang_DexCache.cc +++ b/runtime/native/java_lang_DexCache.cc @@ -53,7 +53,7 @@ static jobject DexCache_getDexNative(JNIEnv* env, jobject javaDexCache) { static jobject DexCache_getResolvedType(JNIEnv* env, jobject javaDexCache, jint type_index) { ScopedFastNativeObjectAccess soa(env); ObjPtr dex_cache = soa.Decode(javaDexCache); - CHECK_LT(static_cast(type_index), dex_cache->NumResolvedTypes()); + CHECK_LT(static_cast(type_index), dex_cache->GetDexFile()->NumTypeIds()); return soa.AddLocalReference(dex_cache->GetResolvedType(dex::TypeIndex(type_index))); } -- cgit v1.2.3-59-g8ed1b