*** old/src/share/vm/gc/parallel/psParallelCompact.cpp	Mon Oct 31 17:46:49 2016
--- new/src/share/vm/gc/parallel/psParallelCompact.cpp	Mon Oct 31 17:46:48 2016

*** 55,64 ****
--- 55,65 ----
  #include "oops/instanceKlass.inline.hpp"
  #include "oops/instanceMirrorKlass.inline.hpp"
  #include "oops/methodData.hpp"
  #include "oops/objArrayKlass.inline.hpp"
  #include "oops/oop.inline.hpp"
+ #include "aot/aotLoader.hpp"
  #include "runtime/atomic.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/safepoint.hpp"
  #include "runtime/vmThread.hpp"
  #include "services/management.hpp"

*** 2181,2190 ****
--- 2182,2194 ----
    // Global (weak) JNI handles
    JNIHandles::weak_oops_do(&oop_closure);
  
    CodeBlobToOopClosure adjust_from_blobs(&oop_closure, CodeBlobToOopClosure::FixRelocations);
    CodeCache::blobs_do(&adjust_from_blobs);
+   if (UseAOT) {
+     AOTLoader::oops_do(&oop_closure);
+   }
    StringTable::oops_do(&oop_closure);
    ref_processor()->weak_oops_do(&oop_closure);
    // Roots were visited so references into the young gen in roots
    // may have been scanned.  Process them also.
    // Should the reference processor have a span that excludes