--- old/src/share/vm/gc/parallel/psTasks.cpp	2016-11-03 04:05:48.301476286 -0700
+++ new/src/share/vm/gc/parallel/psTasks.cpp	2016-11-03 04:05:48.215472469 -0700
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "aot/aotLoader.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "code/codeCache.hpp"
 #include "gc/parallel/cardTableExtension.hpp"
@@ -37,7 +38,6 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
-#include "aot/aotLoader.hpp"
 #include "runtime/fprofiler.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/vmThread.hpp"
@@ -102,9 +102,7 @@
       {
         MarkingCodeBlobClosure each_scavengable_code_blob(&roots_to_old_closure, CodeBlobToOopClosure::FixRelocations);
         CodeCache::scavenge_root_nmethods_do(&each_scavengable_code_blob);
-        if (UseAOT) {
-          AOTLoader::oops_do(&roots_closure);
-        }
+        AOTLoader::oops_do(&roots_closure);
       }
       break;