*** old/src/share/vm/gc/shared/genCollectedHeap.cpp	Mon Oct 31 17:46:50 2016
--- new/src/share/vm/gc/shared/genCollectedHeap.cpp	Mon Oct 31 17:46:50 2016

*** 42,51 ****
--- 42,52 ----
  #include "gc/shared/vmGCOperations.hpp"
  #include "gc/shared/workgroup.hpp"
  #include "memory/filemap.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/oop.inline.hpp"
+ #include "aot/aotLoader.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/handles.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/java.hpp"

*** 71,80 ****
--- 72,82 ----
    GCH_PS_Management_oops_do,
    GCH_PS_SystemDictionary_oops_do,
    GCH_PS_ClassLoaderDataGraph_oops_do,
    GCH_PS_jvmti_oops_do,
    GCH_PS_CodeCache_oops_do,
+   GCH_PS_aot_oops_do,
    GCH_PS_younger_gens,
    // Leave this one last.
    GCH_PS_NumElements
  };
  

*** 606,615 ****
--- 608,620 ----
      Management::oops_do(strong_roots);
    }
    if (!_process_strong_tasks->is_task_claimed(GCH_PS_jvmti_oops_do)) {
      JvmtiExport::oops_do(strong_roots);
    }
+   if (UseAOT && !_process_strong_tasks->is_task_claimed(GCH_PS_aot_oops_do)) {
+     AOTLoader::oops_do(strong_roots);
+   }
  
    if (!_process_strong_tasks->is_task_claimed(GCH_PS_SystemDictionary_oops_do)) {
      SystemDictionary::roots_oops_do(strong_roots, weak_roots);
    }