--- old/src/share/vm/oops/instanceKlass.cpp	2016-11-03 04:05:52.339655489 -0700
+++ new/src/share/vm/oops/instanceKlass.cpp	2016-11-03 04:05:52.248651450 -0700
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "aot/aotLoader.hpp"
 #include "classfile/classFileParser.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.hpp"
@@ -58,7 +59,6 @@
 #include "prims/jvmtiRedefineClasses.hpp"
 #include "prims/jvmtiThreadState.hpp"
 #include "prims/methodComparator.hpp"
-#include "aot/aotLoader.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/fieldDescriptor.hpp"
 #include "runtime/handles.inline.hpp"
@@ -790,10 +790,8 @@
   }
 
 
-  if (UseAOT) {
-    // Look for aot compiled methods for this klass, including class initializer.
-    AOTLoader::load_for_klass(this_k, THREAD);
-  }
+  // Look for aot compiled methods for this klass, including class initializer.
+  AOTLoader::load_for_klass(this_k, THREAD);
 
   // Step 8
   {
@@ -1961,7 +1959,7 @@
 bool InstanceKlass::supers_have_passed_fingerprint_checks() {
   if (java_super() != NULL && !java_super()->has_passed_fingerprint_check()) {
     ResourceMark rm;
-    log_trace(classfingerprint)("%s : super %s not fingerprinted", external_name(), java_super()->external_name());
+    log_trace(class, fingerprint)("%s : super %s not fingerprinted", external_name(), java_super()->external_name());
     return false;
   }
 
@@ -1972,7 +1970,7 @@
       InstanceKlass* intf = InstanceKlass::cast(local_interfaces->at(i));
       if (!intf->has_passed_fingerprint_check()) {
         ResourceMark rm;
-        log_trace(classfingerprint)("%s : interface %s not fingerprinted", external_name(), intf->external_name());
+        log_trace(class, fingerprint)("%s : interface %s not fingerprinted", external_name(), intf->external_name());
         return false;
       }
     }
@@ -2023,7 +2021,7 @@
   Bytes::put_native_u8(adr, (u8)fingerprint); // adr may not be 64-bit aligned
 
   ResourceMark rm;
-  log_trace(classfingerprint)("stored as " PTR64_FORMAT " for class %s", fingerprint, external_name());
+  log_trace(class, fingerprint)("stored as " PTR64_FORMAT " for class %s", fingerprint, external_name());
 }
 
 static void remove_unshareable_in_class(Klass* k) {