commit 1bc977cf2f8199311a97f2ba9431a184540e3e9c
author Nicolas Geoffray <ngeoffray@google.com> Sat Jan 23 14:15:49 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Sat Jan 23 14:15:49 2016 +0000
tree 580a02752d8e447f6dce7cce01386c7e2a9a87f4
parent f7fd970244f143b1abb956e29794c446e4d57f46

Revert "Load app images"

Fails when a method is duplicated (see test 097-duplicate-method)

Bug: 22858531

This reverts commit f7fd970244f143b1abb956e29794c446e4d57f46.

Change-Id: Ib30ae5be00cc568e799290be6b3c8f29cbbe4c20

runtime/runtime.h

diff --git a/runtime/runtime.h b/runtime/runtime.h
index c8c2ee5..20acffb 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -366,7 +366,7 @@
       SHARED_REQUIRES(Locks::mutator_lock_);
 
   // Returns a special method that calls into a trampoline for runtime method resolution
-  ArtMethod* GetResolutionMethod();
+  ArtMethod* GetResolutionMethod() SHARED_REQUIRES(Locks::mutator_lock_);
 
   bool HasResolutionMethod() const {
     return resolution_method_ != nullptr;
@@ -377,8 +377,8 @@
   ArtMethod* CreateResolutionMethod() SHARED_REQUIRES(Locks::mutator_lock_);
 
   // Returns a special method that calls into a trampoline for runtime imt conflicts.
-  ArtMethod* GetImtConflictMethod();
-  ArtMethod* GetImtUnimplementedMethod();
+  ArtMethod* GetImtConflictMethod() SHARED_REQUIRES(Locks::mutator_lock_);
+  ArtMethod* GetImtUnimplementedMethod() SHARED_REQUIRES(Locks::mutator_lock_);
 
   bool HasImtConflictMethod() const {
     return imt_conflict_method_ != nullptr;