diff options
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index d0a7c9b846..fa5df441c7 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -29,7 +29,6 @@ #include "base/macros.h" #include "dex/class_accessor.h" #include "dex/dex_cache_resolved_classes.h" -#include "dex/dex_file.h" #include "dex/dex_file_types.h" #include "gc_root.h" #include "handle.h" @@ -39,6 +38,10 @@ namespace art { +namespace dex { +struct ClassDef; +} // namespace dex + namespace gc { namespace space { class ImageSpace; @@ -73,6 +76,7 @@ class ArtMethod; class ClassHierarchyAnalysis; enum class ClassRoot : uint32_t; class ClassTable; +class DexFile; template<class T> class Handle; class ImtConflictTable; template<typename T> class LengthPrefixedArray; @@ -185,7 +189,7 @@ class ClassLinker { size_t hash, Handle<mirror::ClassLoader> class_loader, const DexFile& dex_file, - const DexFile::ClassDef& dex_class_def) + const dex::ClassDef& dex_class_def) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Locks::dex_lock_); @@ -844,19 +848,19 @@ class ClassLinker { // Precomputes size needed for Class, in the case of a non-temporary class this size must be // sufficient to hold all static fields. uint32_t SizeOfClassWithoutEmbeddedTables(const DexFile& dex_file, - const DexFile::ClassDef& dex_class_def); + const dex::ClassDef& dex_class_def); // Setup the classloader, class def index, type idx so that we can insert this class in the class // table. void SetupClass(const DexFile& dex_file, - const DexFile::ClassDef& dex_class_def, + const dex::ClassDef& dex_class_def, Handle<mirror::Class> klass, ObjPtr<mirror::ClassLoader> class_loader) REQUIRES_SHARED(Locks::mutator_lock_); void LoadClass(Thread* self, const DexFile& dex_file, - const DexFile::ClassDef& dex_class_def, + const dex::ClassDef& dex_class_def, Handle<mirror::Class> klass) REQUIRES_SHARED(Locks::mutator_lock_); @@ -1028,12 +1032,12 @@ class ClassLinker { REQUIRES_SHARED(Locks::mutator_lock_); mirror::MethodHandle* ResolveMethodHandleForField(Thread* self, - const DexFile::MethodHandleItem& method_handle, + const dex::MethodHandleItem& method_handle, ArtMethod* referrer) REQUIRES_SHARED(Locks::mutator_lock_); mirror::MethodHandle* ResolveMethodHandleForMethod(Thread* self, - const DexFile::MethodHandleItem& method_handle, + const dex::MethodHandleItem& method_handle, ArtMethod* referrer) REQUIRES_SHARED(Locks::mutator_lock_); @@ -1403,9 +1407,9 @@ class ClassLoadCallback { Handle<mirror::Class> klass ATTRIBUTE_UNUSED, Handle<mirror::ClassLoader> class_loader ATTRIBUTE_UNUSED, const DexFile& initial_dex_file ATTRIBUTE_UNUSED, - const DexFile::ClassDef& initial_class_def ATTRIBUTE_UNUSED, + const dex::ClassDef& initial_class_def ATTRIBUTE_UNUSED, /*out*/DexFile const** final_dex_file ATTRIBUTE_UNUSED, - /*out*/DexFile::ClassDef const** final_class_def ATTRIBUTE_UNUSED) + /*out*/dex::ClassDef const** final_class_def ATTRIBUTE_UNUSED) REQUIRES_SHARED(Locks::mutator_lock_) {} // A class has been loaded. |