src/share/vm/memory/genCollectedHeap.cpp

rev 5891 : [mq]: hideDoCodeRoots

*** 592,615 ****
  gen_process_strong_roots(int level,
                           bool younger_gens_as_roots,
                           bool activate_scope,
                           SharedHeap::ScanningOption so,
                           OopsInGenClosure* not_older_gens,
-                          bool do_code_roots,
                           OopsInGenClosure* older_gens,
                           KlassClosure* klass_closure) {
    // General strong roots.
  
-   if (!do_code_roots) {
      SharedHeap::process_strong_roots(activate_scope, so,
!                                      not_older_gens, NULL, klass_closure);
!   } else {
!     bool do_code_marking = (activate_scope || nmethod::oops_do_marking_is_active());
!     CodeBlobToOopClosure code_roots(not_older_gens, /*do_marking=*/ do_code_marking);
!     SharedHeap::process_strong_roots(activate_scope, so,
!                                      not_older_gens, &code_roots, klass_closure);
!   }
  
    if (younger_gens_as_roots) {
      if (!_gen_process_strong_tasks->is_task_claimed(GCH_PS_younger_gens)) {
        for (int i = 0; i < level; i++) {
          not_older_gens->set_generation(_gens[i]);
--- 592,607 ----
  gen_process_strong_roots(int level,
                           bool younger_gens_as_roots,
                           bool activate_scope,
                           SharedHeap::ScanningOption so,
                           OopsInGenClosure* not_older_gens,
                           OopsInGenClosure* older_gens,
                           KlassClosure* klass_closure) {
    // General strong roots.
  
    SharedHeap::process_strong_roots(activate_scope, so,
!                                    not_older_gens, klass_closure);
  
    if (younger_gens_as_roots) {
      if (!_gen_process_strong_tasks->is_task_claimed(GCH_PS_younger_gens)) {
        for (int i = 0; i < level; i++) {
          not_older_gens->set_generation(_gens[i]);
*** 627,639 ****
    }
  
    _gen_process_strong_tasks->all_tasks_completed();
  }
  
! void GenCollectedHeap::gen_process_weak_roots(OopClosure* root_closure,
!                                               CodeBlobClosure* code_roots) {
!   SharedHeap::process_weak_roots(root_closure, code_roots);
    // "Local" "weak" refs
    for (int i = 0; i < _n_gens; i++) {
      _gens[i]->ref_processor()->weak_oops_do(root_closure);
    }
  }
--- 619,630 ----
    }
  
    _gen_process_strong_tasks->all_tasks_completed();
  }
  
! void GenCollectedHeap::gen_process_weak_roots(OopClosure* root_closure) {
!   SharedHeap::process_weak_roots(root_closure);
    // "Local" "weak" refs
    for (int i = 0; i < _n_gens; i++) {
      _gens[i]->ref_processor()->weak_oops_do(root_closure);
    }
  }