diff options
| author | Andreas Gampe <agampe@google.com> | 2018-12-28 09:39:56 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2019-01-02 10:32:25 -0800 |
| commit | 3f1dcd39e134d994ac88dcc4f30ec8cabcd8decf (patch) | |
| tree | 365d20ad6b68ff1dbd4903764b63880324136e4d /oatdump/oatdump.cc | |
| parent | 0f0a4e40667c87fbd4ae5480eddbfd701bfabfa2 (diff) | |
| download | art-3f1dcd39e134d994ac88dcc4f30ec8cabcd8decf.tar.gz art-3f1dcd39e134d994ac88dcc4f30ec8cabcd8decf.tar.bz2 art-3f1dcd39e134d994ac88dcc4f30ec8cabcd8decf.zip | |
ART: Move dex structs into own header
Separating out the structs from DexFile allows them to be forward-
declared, which reduces the need to include the dex_file header.
Bug: 119869270
Test: m
Change-Id: I32dde5a632884bca7435cd584b4a81883de2e7b4
Diffstat (limited to 'oatdump/oatdump.cc')
| -rw-r--r-- | oatdump/oatdump.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index d2a5bb87f8..4e1276ef72 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -296,7 +296,7 @@ class OatSymbolizer final { const DexFile& dex_file, uint32_t class_def_index, uint32_t dex_method_index, - const DexFile::CodeItem* code_item, + const dex::CodeItem* code_item, uint32_t method_access_flags) { if ((method_access_flags & kAccAbstract) != 0) { // Abstract method, no code. @@ -723,7 +723,7 @@ class OatDumper { << "': " << error_msg; } else { const char* descriptor = m->GetDeclaringClassDescriptor(); - const DexFile::ClassDef* class_def = + const dex::ClassDef* class_def = OatDexFile::FindClassDef(*dex_file, descriptor, ComputeModifiedUtf8Hash(descriptor)); if (class_def != nullptr) { uint16_t class_def_index = dex_file->GetIndexForClassDef(*class_def); @@ -1092,12 +1092,12 @@ class OatDumper { static constexpr uint32_t kMaxCodeSize = 100 * 1000; bool DumpOatMethod(VariableIndentationOutputStream* vios, - const DexFile::ClassDef& class_def, + const dex::ClassDef& class_def, uint32_t class_method_index, const OatFile::OatClass& oat_class, const DexFile& dex_file, uint32_t dex_method_idx, - const DexFile::CodeItem* code_item, + const dex::CodeItem* code_item, uint32_t method_access_flags, bool* addr_found) { bool success = true; @@ -1490,8 +1490,8 @@ class OatDumper { StackHandleScope<1>* hs, uint32_t dex_method_idx, const DexFile* dex_file, - const DexFile::ClassDef& class_def, - const DexFile::CodeItem* code_item, + const dex::ClassDef& class_def, + const dex::CodeItem* code_item, uint32_t method_access_flags) { if ((method_access_flags & kAccNative) == 0) { ScopedObjectAccess soa(Thread::Current()); @@ -3007,7 +3007,7 @@ class IMTDumper { for (uint32_t class_def_index = 0; class_def_index != dex_file->NumClassDefs(); ++class_def_index) { - const DexFile::ClassDef& class_def = dex_file->GetClassDef(class_def_index); + const dex::ClassDef& class_def = dex_file->GetClassDef(class_def_index); const char* descriptor = dex_file->GetClassDescriptor(class_def); h_klass.Assign(class_linker->FindClass(self, descriptor, h_class_loader)); if (h_klass == nullptr) { |