diff options
Diffstat (limited to 'runtime/oat_file.cc')
| -rw-r--r-- | runtime/oat_file.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc index de4826f417..f4a8c50a26 100644 --- a/runtime/oat_file.cc +++ b/runtime/oat_file.cc @@ -48,7 +48,9 @@ #include "base/unix_file/fd_file.h" #include "base/utils.h" #include "dex/art_dex_file_loader.h" +#include "dex/dex_file.h" #include "dex/dex_file_loader.h" +#include "dex/dex_file_structs.h" #include "dex/dex_file_types.h" #include "dex/standard_dex_file.h" #include "dex/type_lookup_table.h" @@ -1831,13 +1833,13 @@ OatFile::OatClass OatDexFile::GetOatClass(uint16_t class_def_index) const { reinterpret_cast<const OatMethodOffsets*>(methods_pointer)); } -const DexFile::ClassDef* OatDexFile::FindClassDef(const DexFile& dex_file, - const char* descriptor, - size_t hash) { +const dex::ClassDef* OatDexFile::FindClassDef(const DexFile& dex_file, + const char* descriptor, + size_t hash) { const OatDexFile* oat_dex_file = dex_file.GetOatDexFile(); DCHECK_EQ(ComputeModifiedUtf8Hash(descriptor), hash); bool used_lookup_table = false; - const DexFile::ClassDef* lookup_table_classdef = nullptr; + const dex::ClassDef* lookup_table_classdef = nullptr; if (LIKELY((oat_dex_file != nullptr) && oat_dex_file->GetTypeLookupTable().Valid())) { used_lookup_table = true; const uint32_t class_def_idx = oat_dex_file->GetTypeLookupTable().Lookup(descriptor, hash); @@ -1854,10 +1856,10 @@ const DexFile::ClassDef* OatDexFile::FindClassDef(const DexFile& dex_file, DCHECK(!used_lookup_table); return nullptr; } - const DexFile::TypeId* type_id = dex_file.FindTypeId(descriptor); + const dex::TypeId* type_id = dex_file.FindTypeId(descriptor); if (type_id != nullptr) { dex::TypeIndex type_idx = dex_file.GetIndexForTypeId(*type_id); - const DexFile::ClassDef* found_class_def = dex_file.FindClassDef(type_idx); + const dex::ClassDef* found_class_def = dex_file.FindClassDef(type_idx); if (kIsDebugBuild && used_lookup_table) { DCHECK_EQ(found_class_def, lookup_table_classdef); } |