am b19e9bb5: am df1532b9: ART: Correctly make methods preverified

* commit 'b19e9bb527bd156d1dccbc5c6e388917be28b16c':
  ART: Correctly make methods preverified

diff --cc runtime/class_linker.cc
Simple merge

diff --cc runtime/class_linker.h
index 158816d,aef0866..92dab95
--- 1/runtime/class_linker.h
--- 2/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@@ -625,13 -619,18 +625,18 @@@ class ClassLinker 
                              const uint32_t* dex_location_checksum,
                              std::string* error_msg);
  
 -  mirror::ArtMethod* CreateProxyConstructor(Thread* self, Handle<mirror::Class> klass,
 +  mirror::ArtMethod* CreateProxyConstructor(Thread* self, ConstHandle<mirror::Class> klass,
                                              mirror::Class* proxy_class)
        SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 -  mirror::ArtMethod* CreateProxyMethod(Thread* self, Handle<mirror::Class> klass,
 -                                       Handle<mirror::ArtMethod> prototype)
 +  mirror::ArtMethod* CreateProxyMethod(Thread* self, ConstHandle<mirror::Class> klass,
 +                                       ConstHandle<mirror::ArtMethod> prototype)
        SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
  
+   // Ensures that methods have the kAccPreverified bit set. We use the kAccPreverfied bit on the
+   // class access flags to determine whether this has been done before.
+   void EnsurePreverifiedMethods(Handle<mirror::Class> c)
+       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+ 
    mirror::Class* LookupClassFromTableLocked(const char* descriptor,
                                              const mirror::ClassLoader* class_loader,
                                              size_t hash)

diff --cc runtime/class_linker_test.cc
Simple merge

diff --cc runtime/mirror/class-inl.h
Simple merge

diff --cc runtime/mirror/class.h
Simple merge