--- old/src/share/vm/gc/parallel/pcTasks.cpp	2016-11-03 04:05:46.755407676 -0700
+++ new/src/share/vm/gc/parallel/pcTasks.cpp	2016-11-03 04:05:46.669403859 -0700
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "aot/aotLoader.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "code/codeCache.hpp"
 #include "gc/parallel/parallelScavengeHeap.hpp"
@@ -38,7 +39,6 @@
 #include "oops/objArrayKlass.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
-#include "aot/aotLoader.hpp"
 #include "runtime/fprofiler.hpp"
 #include "runtime/jniHandles.hpp"
 #include "runtime/thread.hpp"
@@ -128,9 +128,7 @@
     case code_cache:
       // Do not treat nmethods as strong roots for mark/sweep, since we can unload them.
       //CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure(&mark_and_push_closure));
-      if (UseAOT) {
-        AOTLoader::oops_do(&mark_and_push_closure);
-      }
+      AOTLoader::oops_do(&mark_and_push_closure);
       break;
 
     default: