src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp

rev 5891 : [mq]: hideDoCodeRoots

*** 3392,3403 ****
      assert(Thread::current()->is_VM_thread(),
             "Expected to be executed serially by the VM thread at this point");
  
      if (!silent) { gclog_or_tty->print("Roots "); }
      VerifyRootsClosure rootsCl(vo);
-     G1VerifyCodeRootOopClosure codeRootsCl(this, &rootsCl, vo);
-     G1VerifyCodeRootBlobClosure blobsCl(&codeRootsCl);
      VerifyKlassClosure klassCl(this, &rootsCl);
  
      // We apply the relevant closures to all the oops in the
      // system dictionary, the string table and the code cache.
      const int so = SO_AllClasses | SO_Strings | SO_AllCodeCache;
--- 3392,3401 ----
*** 3406,3419 ****
      ClassLoaderDataGraph::clear_claimed_marks();
  
      process_strong_roots(true,      // activate StrongRootsScope
                           ScanningOption(so),  // roots scanning options
                           &rootsCl,
-                          &blobsCl,
                           &klassCl
                           );
  
      bool failures = rootsCl.failures() || codeRootsCl.failures();
  
      if (vo != VerifyOption_G1UseMarkWord) {
        // If we're verifying during a full GC then the region sets
        // will have been torn down at the start of the GC. Therefore
--- 3404,3421 ----
      ClassLoaderDataGraph::clear_claimed_marks();
  
      process_strong_roots(true,      // activate StrongRootsScope
                           ScanningOption(so),  // roots scanning options
                           &rootsCl,
                           &klassCl
                           );
  
+     // Verify nmethods.
+     G1VerifyCodeRootOopClosure codeRootsCl(this, &rootsCl, vo);
+     G1VerifyCodeRootBlobClosure blobsCl(&codeRootsCl);
+     CodeCache::blobs_do(&blobsCl);
+ 
      bool failures = rootsCl.failures() || codeRootsCl.failures();
  
      if (vo != VerifyOption_G1UseMarkWord) {
        // If we're verifying during a full GC then the region sets
        // will have been torn down at the start of the GC. Therefore
*** 5113,5128 ****
    double ext_roots_start = os::elapsedTime();
    double closure_app_time_sec = 0.0;
  
    BufferingOopClosure buf_scan_non_heap_roots(scan_non_heap_roots);
  
-   CodeBlobToOopClosure scan_code_roots(&buf_scan_non_heap_roots, true /* do_marking */);
- 
    process_strong_roots(false, // no scoping; this is parallel code
                         so,
                         &buf_scan_non_heap_roots,
-                        &scan_code_roots,
                         scan_klasses
                         );
  
    // Now the CM ref_processor roots.
    if (!_process_strong_tasks->is_task_claimed(G1H_PS_refProcessor_oops_do)) {
--- 5115,5127 ----
*** 5178,5193 ****
    g1_rem_set()->oops_into_collection_set_do(scan_rs, &eager_scan_code_roots, worker_i);
  
    _process_strong_tasks->all_tasks_completed();
  }
  
- void
- G1CollectedHeap::g1_process_weak_roots(OopClosure* root_closure) {
-   CodeBlobToOopClosure roots_in_blobs(root_closure, /*do_marking=*/ false);
-   SharedHeap::process_weak_roots(root_closure, &roots_in_blobs);
- }
- 
  class G1StringSymbolTableUnlinkTask : public AbstractGangTask {
  private:
    BoolObjectClosure* _is_alive;
    int _initial_string_table_size;
    int _initial_symbol_table_size;
--- 5177,5186 ----