diff options
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index d684ad5689..9771318d49 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -369,6 +369,10 @@ class ClassLinker { return quick_imt_conflict_trampoline_; } + const void* GetQuickToInterpreterBridgeTrampoline() const { + return quick_to_interpreter_bridge_trampoline_; + } + InternTable* GetInternTable() const { return intern_table_; } @@ -433,6 +437,12 @@ class ClassLinker { const SirtRef<mirror::Class>& klass, mirror::ClassLoader* class_loader) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + void LoadClassMembers(const DexFile& dex_file, + const byte* class_data, + const SirtRef<mirror::Class>& klass, + mirror::ClassLoader* class_loader, + const OatFile::OatClass* oat_class) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void LoadField(const DexFile& dex_file, const ClassDataItemIterator& it, const SirtRef<mirror::Class>& klass, const SirtRef<mirror::ArtField>& dst) @@ -446,7 +456,7 @@ class ClassLinker { void FixupStaticTrampolines(mirror::Class* klass) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); // Finds the associated oat class for a dex_file and descriptor - const OatFile::OatClass* GetOatClass(const DexFile& dex_file, uint16_t class_def_idx) + OatFile::OatClass GetOatClass(const DexFile& dex_file, uint16_t class_def_idx) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void RegisterDexFileLocked(const DexFile& dex_file, const SirtRef<mirror::DexCache>& dex_cache) @@ -652,6 +662,7 @@ class ClassLinker { const void* portable_imt_conflict_trampoline_; const void* quick_imt_conflict_trampoline_; const void* quick_generic_jni_trampoline_; + const void* quick_to_interpreter_bridge_trampoline_; friend class ImageWriter; // for GetClassRoots FRIEND_TEST(ClassLinkerTest, ClassRootDescriptors); |