*** old/src/share/vm/gc/parallel/pcTasks.cpp	Thu Nov  3 14:16:32 2016
--- new/src/share/vm/gc/parallel/pcTasks.cpp	Thu Nov  3 14:16:32 2016

*** 21,30 ****
--- 21,31 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "aot/aotLoader.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
  #include "gc/parallel/parallelScavengeHeap.hpp"
  #include "gc/parallel/pcTasks.hpp"
  #include "gc/parallel/psCompactionManager.inline.hpp"

*** 125,134 ****
--- 126,136 ----
        break;
  
      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));
+       AOTLoader::oops_do(&mark_and_push_closure);
        break;
  
      default:
        fatal("Unknown root type");
    }