src/share/vm/gc/cms/parNewGeneration.cpp

*** 491,501 ****
    }
  }
  
  ParScanClosure::ParScanClosure(ParNewGeneration* g,
                                 ParScanThreadState* par_scan_state) :
!   OopsInKlassOrGenClosure(g), _par_scan_state(par_scan_state), _g(g) {
    _boundary = _g->reserved().end();
  }
  
  void ParScanWithBarrierClosure::do_oop(oop* p)       { ParScanClosure::do_oop_work(p, true, false); }
  void ParScanWithBarrierClosure::do_oop(narrowOop* p) { ParScanClosure::do_oop_work(p, true, false); }
--- 491,501 ----
    }
  }
  
  ParScanClosure::ParScanClosure(ParNewGeneration* g,
                                 ParScanThreadState* par_scan_state) :
!   OopsInGenClosure(g), _par_scan_state(par_scan_state), _g(g) {
    _boundary = _g->reserved().end();
  }
  
  void ParScanWithBarrierClosure::do_oop(oop* p)       { ParScanClosure::do_oop_work(p, true, false); }
  void ParScanWithBarrierClosure::do_oop(narrowOop* p) { ParScanClosure::do_oop_work(p, true, false); }
*** 599,612 ****
    ParScanThreadState& par_scan_state = _state_set->thread_state(worker_id);
    assert(_state_set->is_valid(worker_id), "Should not have been called");
  
    par_scan_state.set_young_old_boundary(_young_old_boundary);
  
!   KlassScanClosure klass_scan_closure(&par_scan_state.to_space_root_closure(),
!                                       gch->rem_set()->klass_rem_set());
!   CLDToKlassAndOopClosure cld_scan_closure(&klass_scan_closure,
!                                            &par_scan_state.to_space_root_closure(),
                                             false);
  
    par_scan_state.start_strong_roots();
    gch->young_process_roots(_strong_roots_scope,
                             &par_scan_state.to_space_root_closure(),
--- 599,609 ----
    ParScanThreadState& par_scan_state = _state_set->thread_state(worker_id);
    assert(_state_set->is_valid(worker_id), "Should not have been called");
  
    par_scan_state.set_young_old_boundary(_young_old_boundary);
  
!   CLDToKlassAndOopClosure cld_scan_closure(&par_scan_state.to_space_root_closure(),
                                             false);
  
    par_scan_state.start_strong_roots();
    gch->young_process_roots(_strong_roots_scope,
                             &par_scan_state.to_space_root_closure(),