*** old/src/share/vm/gc/g1/g1RootProcessor.cpp	Mon Oct 31 17:46:45 2016
--- new/src/share/vm/gc/g1/g1RootProcessor.cpp	Mon Oct 31 17:46:45 2016

*** 35,44 ****
--- 35,45 ----
  #include "gc/g1/g1Policy.hpp"
  #include "gc/g1/g1RootClosures.hpp"
  #include "gc/g1/g1RootProcessor.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "memory/allocation.inline.hpp"
+ #include "aot/aotLoader.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/mutex.hpp"
  #include "services/management.hpp"
  
  void G1RootProcessor::worker_has_discovered_all_strong_classes() {

*** 288,297 ****
--- 289,307 ----
      if (!_process_strong_tasks.is_task_claimed(G1RP_PS_jvmti_oops_do)) {
        JvmtiExport::oops_do(strong_roots);
      }
    }
  
+ #if INCLUDE_AOT
+   if (UseAOT) {
+     G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::AOTCodeRoots, worker_i);
+     if (!_process_strong_tasks.is_task_claimed(G1RP_PS_aot_oops_do)) {
+         AOTLoader::oops_do(strong_roots);
+     }
+   }
+ #endif
+ 
    {
      G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::SystemDictionaryRoots, worker_i);
      if (!_process_strong_tasks.is_task_claimed(G1RP_PS_SystemDictionary_oops_do)) {
        SystemDictionary::roots_oops_do(strong_roots, weak_roots);
      }