From 3f1dcd39e134d994ac88dcc4f30ec8cabcd8decf Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 28 Dec 2018 09:39:56 -0800 Subject: 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 --- compiler/debug/elf_debug_info_writer.h | 6 +++--- compiler/debug/elf_debug_writer.cc | 2 +- compiler/debug/method_debug_info.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'compiler/debug') diff --git a/compiler/debug/elf_debug_info_writer.h b/compiler/debug/elf_debug_info_writer.h index bb550b3060..a63f241f53 100644 --- a/compiler/debug/elf_debug_info_writer.h +++ b/compiler/debug/elf_debug_info_writer.h @@ -152,9 +152,9 @@ class ElfCompilationUnitWriter { DCHECK(mi->dex_file != nullptr); const DexFile* dex = mi->dex_file; CodeItemDebugInfoAccessor accessor(*dex, mi->code_item, mi->dex_method_index); - const DexFile::MethodId& dex_method = dex->GetMethodId(mi->dex_method_index); - const DexFile::ProtoId& dex_proto = dex->GetMethodPrototype(dex_method); - const DexFile::TypeList* dex_params = dex->GetProtoParameters(dex_proto); + const dex::MethodId& dex_method = dex->GetMethodId(mi->dex_method_index); + const dex::ProtoId& dex_proto = dex->GetMethodPrototype(dex_method); + const dex::TypeList* dex_params = dex->GetProtoParameters(dex_proto); const char* dex_class_desc = dex->GetMethodDeclaringClassDescriptor(dex_method); const bool is_static = (mi->access_flags & kAccStatic) != 0; diff --git a/compiler/debug/elf_debug_writer.cc b/compiler/debug/elf_debug_writer.cc index 0f2d73e5aa..16f163b085 100644 --- a/compiler/debug/elf_debug_writer.cc +++ b/compiler/debug/elf_debug_writer.cc @@ -54,7 +54,7 @@ void WriteDebugInfo(linker::ElfBuilder* builder, WriteCFISection(builder, debug_info.compiled_methods, cfi_format, write_oat_patches); // Group the methods into compilation units based on class. - std::unordered_map class_to_compilation_unit; + std::unordered_map class_to_compilation_unit; for (const MethodDebugInfo& mi : debug_info.compiled_methods) { if (mi.dex_file != nullptr) { auto& dex_class_def = mi.dex_file->GetClassDef(mi.class_def_index); diff --git a/compiler/debug/method_debug_info.h b/compiler/debug/method_debug_info.h index 729c403f00..152db6eaf0 100644 --- a/compiler/debug/method_debug_info.h +++ b/compiler/debug/method_debug_info.h @@ -32,7 +32,7 @@ struct MethodDebugInfo { size_t class_def_index; uint32_t dex_method_index; uint32_t access_flags; - const DexFile::CodeItem* code_item; + const dex::CodeItem* code_item; InstructionSet isa; bool deduped; bool is_native_debuggable; -- cgit v1.2.3