From 1f1cb9f2f0945dbcf6b79d0795b035233dfd9131 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 4 Jun 2018 09:22:46 -0700 Subject: Revert "Revert "Move runtime/ to ClassAccessor"" Fixed misplaced UnhideAccessFlags to be outside of a conditional that the code item is null / not deduped. This fixes an issue where these methods would not have had their access flags restored. Bug: 77709234 Bug: 79758018 Bug: 91962648 This reverts commit cc7e20f9ec7b4a7a57f7196e5e8be67a727f21d3. Test: test-art-host Test: atest FrameworksUiServicesTests Test: atest CtsInlineMockingTestCases Change-Id: I7e5712cdcccef81e19ce81d26743c517b0b8a67d --- runtime/class_linker.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'runtime/class_linker.h') diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 58ce6eb25c..0f76bf3722 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -27,6 +27,7 @@ #include "base/enums.h" #include "base/macros.h" #include "base/mutex.h" +#include "dex/class_accessor.h" #include "dex/dex_cache_resolved_classes.h" #include "dex/dex_file.h" #include "dex/dex_file_types.h" @@ -825,18 +826,14 @@ class ClassLinker { const DexFile::ClassDef& dex_class_def, Handle klass) REQUIRES_SHARED(Locks::mutator_lock_); - void LoadClassMembers(Thread* self, - const DexFile& dex_file, - const uint8_t* class_data, - Handle klass) - REQUIRES_SHARED(Locks::mutator_lock_); - void LoadField(const ClassDataItemIterator& it, Handle klass, ArtField* dst) + void LoadField(const ClassAccessor::Field& field, Handle klass, ArtField* dst) REQUIRES_SHARED(Locks::mutator_lock_); void LoadMethod(const DexFile& dex_file, - const ClassDataItemIterator& it, - Handle klass, ArtMethod* dst) + const ClassAccessor::Method& method, + Handle klass, + ArtMethod* dst) REQUIRES_SHARED(Locks::mutator_lock_); void FixupStaticTrampolines(ObjPtr klass) REQUIRES_SHARED(Locks::mutator_lock_); -- cgit v1.2.3-59-g8ed1b