--- old/src/share/vm/gc/g1/g1RootProcessor.cpp	2016-11-03 14:16:30.000000000 -0700
+++ new/src/share/vm/gc/g1/g1RootProcessor.cpp	2016-11-03 14:16:30.000000000 -0700
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 
+#include "aot/aotLoader.hpp"
 #include "classfile/stringTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "code/codeCache.hpp"
@@ -290,6 +291,15 @@
     }
   }
 
+#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)) {