diff options
| author | Andreas Gampe <agampe@google.com> | 2016-11-17 15:21:22 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2016-11-21 10:57:00 -0800 |
| commit | a5b09a67034e57a6e10231dd4bd92f4cb50b824c (patch) | |
| tree | 304be738f4fa528b7ad2676103eecc84c79eaeeb /runtime/native/java_lang_DexCache.cc | |
| parent | dac7ad17c78387d15d7aefae0f852dddf5f37e34 (diff) | |
ART: Add dex::TypeIndex
Add abstraction for uint16_t type index.
Test: m test-art-host
Change-Id: I47708741c7c579cbbe59ab723c1e31c5fe71f83a
Diffstat (limited to 'runtime/native/java_lang_DexCache.cc')
| -rw-r--r-- | runtime/native/java_lang_DexCache.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/native/java_lang_DexCache.cc b/runtime/native/java_lang_DexCache.cc index 71379a51a5..f6de593017 100644 --- a/runtime/native/java_lang_DexCache.cc +++ b/runtime/native/java_lang_DexCache.cc @@ -17,6 +17,7 @@ #include "java_lang_DexCache.h" #include "dex_file.h" +#include "dex_file_types.h" #include "jni_internal.h" #include "mirror/class-inl.h" #include "mirror/dex_cache-inl.h" @@ -53,7 +54,7 @@ static jobject DexCache_getResolvedType(JNIEnv* env, jobject javaDexCache, jint ScopedFastNativeObjectAccess soa(env); ObjPtr<mirror::DexCache> dex_cache = soa.Decode<mirror::DexCache>(javaDexCache); CHECK_LT(static_cast<size_t>(type_index), dex_cache->NumResolvedTypes()); - return soa.AddLocalReference<jobject>(dex_cache->GetResolvedType(type_index)); + return soa.AddLocalReference<jobject>(dex_cache->GetResolvedType(dex::TypeIndex(type_index))); } static jobject DexCache_getResolvedString(JNIEnv* env, jobject javaDexCache, jint string_index) { @@ -68,7 +69,7 @@ static void DexCache_setResolvedType(JNIEnv* env, jobject javaDexCache, jint typ ScopedFastNativeObjectAccess soa(env); ObjPtr<mirror::DexCache> dex_cache = soa.Decode<mirror::DexCache>(javaDexCache); CHECK_LT(static_cast<size_t>(type_index), dex_cache->NumResolvedTypes()); - dex_cache->SetResolvedType(type_index, soa.Decode<mirror::Class>(type)); + dex_cache->SetResolvedType(dex::TypeIndex(type_index), soa.Decode<mirror::Class>(type)); } static void DexCache_setResolvedString(JNIEnv* env, jobject javaDexCache, jint string_index, |