diff options
| author | 2017-03-14 10:13:21 +0000 | |
|---|---|---|
| committer | 2017-03-14 13:55:13 +0000 | |
| commit | 8d6768d47b66a688d35399d524ad5a5450e9d9d4 (patch) | |
| tree | 0b8733baef378d9e060c8e74319a3846489590b2 /runtime/native/java_lang_DexCache.cc | |
| parent | fbe1516b91f2117bb9c7282aaea5537572f62dd7 (diff) | |
Revert^6 "Hash-based dex cache type array."
Fixed ImageWriter to write class table also if it contains
only boot class loader classes. Added a regression test and
added extra checks for debug-build to verify that dex cache
types from app image are also in the class table. Removed
some unnecessary debug output.
Test: 158-app-image-class-table
Bug: 34839984
Bug: 30627598
Bug: 34659969
This reverts commit 0b66d6174bf1f6023f9d36dda8538490b79c2e9f.
Change-Id: I6a747904940c6ebc297f4946feef99dc0adf930c
Diffstat (limited to 'runtime/native/java_lang_DexCache.cc')
| -rw-r--r-- | runtime/native/java_lang_DexCache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/native/java_lang_DexCache.cc b/runtime/native/java_lang_DexCache.cc index ada3a9d558..8fda4dfaaf 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<mirror::DexCache> dex_cache = soa.Decode<mirror::DexCache>(javaDexCache); - CHECK_LT(static_cast<size_t>(type_index), dex_cache->NumResolvedTypes()); + CHECK_LT(static_cast<size_t>(type_index), dex_cache->GetDexFile()->NumTypeIds()); return soa.AddLocalReference<jobject>(dex_cache->GetResolvedType(dex::TypeIndex(type_index))); } |