commit 1f1cb9f2f0945dbcf6b79d0795b035233dfd9131
author Mathieu Chartier <mathieuc@google.com> Mon Jun 04 09:22:46 2018 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Jun 04 20:41:12 2018 +0000
tree fc5f72ef884e0eaa92f515a90cfd997b0938208a
parent 9ddef18ae95859a985e7a0de7e22999fcbc28e07

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

diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 58ce6eb..0f76bf3 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 @@
                  const DexFile::ClassDef& dex_class_def,
                  Handle<mirror::Class> klass)
       REQUIRES_SHARED(Locks::mutator_lock_);
-  void LoadClassMembers(Thread* self,
-                        const DexFile& dex_file,
-                        const uint8_t* class_data,
-                        Handle<mirror::Class> klass)
-      REQUIRES_SHARED(Locks::mutator_lock_);
 
-  void LoadField(const ClassDataItemIterator& it, Handle<mirror::Class> klass, ArtField* dst)
+  void LoadField(const ClassAccessor::Field& field, Handle<mirror::Class> klass, ArtField* dst)
       REQUIRES_SHARED(Locks::mutator_lock_);
 
   void LoadMethod(const DexFile& dex_file,
-                  const ClassDataItemIterator& it,
-                  Handle<mirror::Class> klass, ArtMethod* dst)
+                  const ClassAccessor::Method& method,
+                  Handle<mirror::Class> klass,
+                  ArtMethod* dst)
       REQUIRES_SHARED(Locks::mutator_lock_);
 
   void FixupStaticTrampolines(ObjPtr<mirror::Class> klass) REQUIRES_SHARED(Locks::mutator_lock_);