--- a/hotspot/src/share/vm/aot/aotCompiledMethod.cpp	Wed Mar 15 11:44:46 2017 +0100
+++ b/hotspot/src/share/vm/aot/aotCompiledMethod.cpp	Wed Mar 15 10:25:37 2017 -0400
@@ -143,9 +143,8 @@
       int full_len = 2 + klass_len + 2 + method_name_len + 2 + signature_len;
       if (!klass_matched || memcmp(_name, meta_name, full_len) != 0) { // Does not match?
         Thread* thread = Thread::current();
-        KlassHandle klass = KlassHandle(thread, k);
         const char* method_name = klass_name + klass_len;
-        m = AOTCodeHeap::find_method(klass, thread, method_name);
+        m = AOTCodeHeap::find_method(k, thread, method_name);
       }
       meta = ((intptr_t)m) | 1;
       *entry = (Metadata*)meta; // Should be atomic on x64
@@ -239,7 +238,7 @@
 
 // We don't have full dependencies for AOT methods, so flushing is
 // more conservative than for nmethods.
-void AOTCompiledMethod::flush_evol_dependents_on(instanceKlassHandle dependee) {
+void AOTCompiledMethod::flush_evol_dependents_on(InstanceKlass* dependee) {
   if (is_java_method()) {
     cleanup_inline_caches();
     mark_for_deoptimization();