diff options
Diffstat (limited to 'dex2oat/linker')
| -rw-r--r-- | dex2oat/linker/image_test.h | 2 | ||||
| -rw-r--r-- | dex2oat/linker/image_writer.cc | 8 | ||||
| -rw-r--r-- | dex2oat/linker/oat_writer.cc | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/dex2oat/linker/image_test.h b/dex2oat/linker/image_test.h index fa0a3d4ac9..70a22b5077 100644 --- a/dex2oat/linker/image_test.h +++ b/dex2oat/linker/image_test.h @@ -492,7 +492,7 @@ inline void ImageTest::TestWriteRead(ImageHeader::StorageMode storage_mode, CHECK_EQ(kRequestedImageBase, reinterpret_cast<uintptr_t>(image_begin)); } for (size_t j = 0; j < dex->NumClassDefs(); ++j) { - const DexFile::ClassDef& class_def = dex->GetClassDef(j); + const dex::ClassDef& class_def = dex->GetClassDef(j); const char* descriptor = dex->GetClassDescriptor(class_def); ObjPtr<mirror::Class> klass = class_linker_->FindSystemClass(soa.Self(), descriptor); EXPECT_TRUE(klass != nullptr) << descriptor; diff --git a/dex2oat/linker/image_writer.cc b/dex2oat/linker/image_writer.cc index e4e4b13458..1331fc3bac 100644 --- a/dex2oat/linker/image_writer.cc +++ b/dex2oat/linker/image_writer.cc @@ -1586,7 +1586,7 @@ void ImageWriter::PruneDexCache(ObjPtr<mirror::DexCache> dex_cache, // Check if the referenced class is in the image. Note that we want to check the referenced // class rather than the declaring class to preserve the semantics, i.e. using a MethodId // results in resolving the referenced class and that can for example throw OOME. - const DexFile::MethodId& method_id = dex_file.GetMethodId(stored_index); + const dex::MethodId& method_id = dex_file.GetMethodId(stored_index); if (method_id.class_idx_ != last_class_idx) { last_class_idx = method_id.class_idx_; last_class = class_linker->LookupResolvedType(last_class_idx, dex_cache, class_loader); @@ -1612,7 +1612,7 @@ void ImageWriter::PruneDexCache(ObjPtr<mirror::DexCache> dex_cache, // Check if the referenced class is in the image. Note that we want to check the referenced // class rather than the declaring class to preserve the semantics, i.e. using a FieldId // results in resolving the referenced class and that can for example throw OOME. - const DexFile::FieldId& field_id = dex_file.GetFieldId(stored_index); + const dex::FieldId& field_id = dex_file.GetFieldId(stored_index); if (field_id.class_idx_ != last_class_idx) { last_class_idx = field_id.class_idx_; last_class = class_linker->LookupResolvedType(last_class_idx, dex_cache, class_loader); @@ -1663,7 +1663,7 @@ void ImageWriter::PreloadDexCache(ObjPtr<mirror::DexCache> dex_cache, // Check if the referenced class is in the image. Note that we want to check the referenced // class rather than the declaring class to preserve the semantics, i.e. using a MethodId // results in resolving the referenced class and that can for example throw OOME. - const DexFile::MethodId& method_id = dex_file.GetMethodId(i); + const dex::MethodId& method_id = dex_file.GetMethodId(i); if (method_id.class_idx_ != last_class_idx) { last_class_idx = method_id.class_idx_; last_class = class_linker->LookupResolvedType(last_class_idx, dex_cache, class_loader); @@ -1695,7 +1695,7 @@ void ImageWriter::PreloadDexCache(ObjPtr<mirror::DexCache> dex_cache, // Check if the referenced class is in the image. Note that we want to check the referenced // class rather than the declaring class to preserve the semantics, i.e. using a FieldId // results in resolving the referenced class and that can for example throw OOME. - const DexFile::FieldId& field_id = dex_file.GetFieldId(i); + const dex::FieldId& field_id = dex_file.GetFieldId(i); if (field_id.class_idx_ != last_class_idx) { last_class_idx = field_id.class_idx_; last_class = class_linker->LookupResolvedType(last_class_idx, dex_cache, class_loader); diff --git a/dex2oat/linker/oat_writer.cc b/dex2oat/linker/oat_writer.cc index e2a9ac2a8f..be9a0cb0a2 100644 --- a/dex2oat/linker/oat_writer.cc +++ b/dex2oat/linker/oat_writer.cc @@ -1011,7 +1011,7 @@ struct OatWriter::OrderedMethodData { size_t class_def_index; uint32_t access_flags; - const DexFile::CodeItem* code_item; + const dex::CodeItem* code_item; // A value of -1 denotes missing debug info static constexpr size_t kDebugInfoIdxInvalid = static_cast<size_t>(-1); @@ -1506,7 +1506,7 @@ class OatWriter::InitImageMethodVisitor : public OatDexMethodVisitor { return true; } ObjPtr<mirror::DexCache> dex_cache = class_linker_->FindDexCache(Thread::Current(), *dex_file); - const DexFile::ClassDef& class_def = dex_file->GetClassDef(class_def_index); + const dex::ClassDef& class_def = dex_file->GetClassDef(class_def_index); ObjPtr<mirror::Class> klass = class_linker_->LookupResolvedType(class_def.class_idx_, dex_cache, class_loader_); if (klass != nullptr) { @@ -1585,7 +1585,7 @@ class OatWriter::InitImageMethodVisitor : public OatDexMethodVisitor { // Check whether current class is image class bool IsImageClass() { - const DexFile::TypeId& type_id = + const dex::TypeId& type_id = dex_file_->GetTypeId(dex_file_->GetClassDef(class_def_index_).class_idx_); const char* class_descriptor = dex_file_->GetTypeDescriptor(type_id); return writer_->GetCompilerOptions().IsImageClass(class_descriptor); |