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

*** 59,71 ****
  
  void G1MarkSweep::invoke_at_safepoint(ReferenceProcessor* rp,
                                        bool clear_all_softrefs) {
    assert(SafepointSynchronize::is_at_safepoint(), "must be at a safepoint");
  
-   SharedHeap* sh = SharedHeap::heap();
  #ifdef ASSERT
!   if (sh->collector_policy()->should_clear_all_soft_refs()) {
      assert(clear_all_softrefs, "Policy should have been checked earler");
    }
  #endif
    // hook up weak ref data so it can be used during Mark-Sweep
    assert(GenMarkSweep::ref_processor() == NULL, "no stomping");
--- 59,70 ----
  
  void G1MarkSweep::invoke_at_safepoint(ReferenceProcessor* rp,
                                        bool clear_all_softrefs) {
    assert(SafepointSynchronize::is_at_safepoint(), "must be at a safepoint");
  
  #ifdef ASSERT
!   if (G1CollectedHeap::heap()->collector_policy()->should_clear_all_soft_refs()) {
      assert(clear_all_softrefs, "Policy should have been checked earler");
    }
  #endif
    // hook up weak ref data so it can be used during Mark-Sweep
    assert(GenMarkSweep::ref_processor() == NULL, "no stomping");