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

*** 218,233 ****
      }
      return false;
    }
  };
  
- class G1AlwaysTrueClosure: public BoolObjectClosure {
- public:
-   bool do_object_b(oop p) { return true; }
- };
- static G1AlwaysTrueClosure always_true;
- 
  void G1MarkSweep::mark_sweep_phase3() {
    G1CollectedHeap* g1h = G1CollectedHeap::heap();
  
    // Adjust the pointers to reflect the new locations
    GCTraceTime(Trace, gc) tm("Phase 3: Adjust pointers", gc_timer());
--- 218,227 ----
*** 246,256 ****
    assert(GenMarkSweep::ref_processor() == g1h->ref_processor_stw(), "Sanity");
    g1h->ref_processor_stw()->weak_oops_do(&GenMarkSweep::adjust_pointer_closure);
  
    // Now adjust pointers in remaining weak roots.  (All of which should
    // have been cleared if they pointed to non-surviving objects.)
!   JNIHandles::weak_oops_do(&always_true, &GenMarkSweep::adjust_pointer_closure);
  
    if (G1StringDedup::is_enabled()) {
      G1StringDedup::oops_do(&GenMarkSweep::adjust_pointer_closure);
    }
  
--- 240,250 ----
    assert(GenMarkSweep::ref_processor() == g1h->ref_processor_stw(), "Sanity");
    g1h->ref_processor_stw()->weak_oops_do(&GenMarkSweep::adjust_pointer_closure);
  
    // Now adjust pointers in remaining weak roots.  (All of which should
    // have been cleared if they pointed to non-surviving objects.)
!   JNIHandles::weak_oops_do(&GenMarkSweep::adjust_pointer_closure);
  
    if (G1StringDedup::is_enabled()) {
      G1StringDedup::oops_do(&GenMarkSweep::adjust_pointer_closure);
    }