*** old/src/share/vm/oops/instanceKlass.cpp	Thu Nov  3 04:05:52 2016
--- new/src/share/vm/oops/instanceKlass.cpp	Thu Nov  3 04:05:52 2016

*** 21,30 ****
--- 21,31 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "aot/aotLoader.hpp"
  #include "classfile/classFileParser.hpp"
  #include "classfile/classFileStream.hpp"
  #include "classfile/classLoader.hpp"
  #include "classfile/javaClasses.hpp"
  #include "classfile/systemDictionary.hpp"

*** 56,66 ****
--- 57,66 ----
  #include "oops/symbol.hpp"
  #include "prims/jvmtiExport.hpp"
  #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"
  #include "runtime/javaCalls.hpp"
  #include "runtime/mutexLocker.hpp"

*** 788,801 ****
--- 788,799 ----
        THROW_OOP(e());
      }
    }
  
  
    if (UseAOT) {
      // Look for aot compiled methods for this klass, including class initializer.
      AOTLoader::load_for_klass(this_k, THREAD);
    }
  
    // Step 8
    {
      assert(THREAD->is_Java_thread(), "non-JavaThread in initialize_impl");
      JavaThread* jt = (JavaThread*)THREAD;

*** 1959,1980 ****
--- 1957,1978 ----
  }
  
  bool InstanceKlass::supers_have_passed_fingerprint_checks() {
    if (java_super() != NULL && !java_super()->has_passed_fingerprint_check()) {
      ResourceMark rm;
!     log_trace(class, fingerprint)("%s : super %s not fingerprinted", external_name(), java_super()->external_name());
      return false;
    }
  
    Array<Klass*>* local_interfaces = this->local_interfaces();
    if (local_interfaces != NULL) {
      int length = local_interfaces->length();
      for (int i = 0; i < length; i++) {
        InstanceKlass* intf = InstanceKlass::cast(local_interfaces->at(i));
        if (!intf->has_passed_fingerprint_check()) {
          ResourceMark rm;
!         log_trace(class, fingerprint)("%s : interface %s not fingerprinted", external_name(), intf->external_name());
          return false;
        }
      }
    }
  

*** 2021,2031 ****
--- 2019,2029 ----
    address adr = adr_fingerprint();
    assert(adr != NULL, "sanity");
    Bytes::put_native_u8(adr, (u8)fingerprint); // adr may not be 64-bit aligned
  
    ResourceMark rm;
!   log_trace(class, fingerprint)("stored as " PTR64_FORMAT " for class %s", fingerprint, external_name());
  }
  
  static void remove_unshareable_in_class(Klass* k) {
    // remove klass's unshareable info
    k->remove_unshareable_info();