diff options
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index f3aba970b9..0de647f509 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -7485,7 +7485,7 @@ void ClassLinker::CreateReferenceInstanceOffsets(Handle<mirror::Class> klass) { } mirror::String* ClassLinker::ResolveString(const DexFile& dex_file, - uint32_t string_idx, + dex::StringIndex string_idx, Handle<mirror::DexCache> dex_cache) { DCHECK(dex_cache.Get() != nullptr); Thread::PoisonObjectPointersIfDebug(); @@ -7501,7 +7501,7 @@ mirror::String* ClassLinker::ResolveString(const DexFile& dex_file, } mirror::String* ClassLinker::LookupString(const DexFile& dex_file, - uint32_t string_idx, + dex::StringIndex string_idx, Handle<mirror::DexCache> dex_cache) { DCHECK(dex_cache.Get() != nullptr); ObjPtr<mirror::String> resolved = dex_cache->GetResolvedString(string_idx); @@ -7510,7 +7510,8 @@ mirror::String* ClassLinker::LookupString(const DexFile& dex_file, } uint32_t utf16_length; const char* utf8_data = dex_file.StringDataAndUtf16LengthByIdx(string_idx, &utf16_length); - ObjPtr<mirror::String> string = intern_table_->LookupStrong(Thread::Current(), utf16_length, utf8_data); + ObjPtr<mirror::String> string = + intern_table_->LookupStrong(Thread::Current(), utf16_length, utf8_data); if (string != nullptr) { dex_cache->SetResolvedString(string_idx, string); } |