*** old/src/share/vm/gc/parallel/psMarkSweep.cpp	Thu Nov  3 14:16:33 2016
--- new/src/share/vm/gc/parallel/psMarkSweep.cpp	Thu Nov  3 14:16:33 2016

*** 21,30 ****
--- 21,31 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "aot/aotLoader.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/symbolTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
  #include "gc/parallel/parallelScavengeHeap.hpp"

*** 513,522 ****
--- 514,524 ----
      JvmtiExport::oops_do(mark_and_push_closure());
      SystemDictionary::always_strong_oops_do(mark_and_push_closure());
      ClassLoaderDataGraph::always_strong_cld_do(follow_cld_closure());
      // Do not treat nmethods as strong roots for mark/sweep, since we can unload them.
      //CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure(mark_and_push_closure()));
+     AOTLoader::oops_do(mark_and_push_closure());
    }
  
    // Flush marking stack.
    follow_stack();
  

*** 609,618 ****
--- 611,621 ----
    // Global (weak) JNI handles
    JNIHandles::weak_oops_do(adjust_pointer_closure());
  
    CodeBlobToOopClosure adjust_from_blobs(adjust_pointer_closure(), CodeBlobToOopClosure::FixRelocations);
    CodeCache::blobs_do(&adjust_from_blobs);
+   AOTLoader::oops_do(adjust_pointer_closure());
    StringTable::oops_do(adjust_pointer_closure());
    ref_processor()->weak_oops_do(adjust_pointer_closure());
    PSScavenge::reference_processor()->weak_oops_do(adjust_pointer_closure());
  
    adjust_marks();