--- a/hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp Sun Dec 11 12:05:57 2016 -0800
+++ b/hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp Sun Dec 11 19:07:04 2016 -0800
@@ -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)) {