src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp

rev 8068 : imported patch parallelscavenge_cleanup

*** 39,50 ****
  }
  
  void VM_ParallelGCFailedAllocation::doit() {
    SvcGCMarker sgcm(SvcGCMarker::MINOR);
  
!   ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "must be a ParallelScavengeHeap");
  
    GCCauseSetter gccs(heap, _gc_cause);
    _result = heap->failed_mem_allocate(_word_size);
  
    if (_result == NULL && GC_locker::is_active_and_needs_gc()) {
--- 39,49 ----
  }
  
  void VM_ParallelGCFailedAllocation::doit() {
    SvcGCMarker sgcm(SvcGCMarker::MINOR);
  
!   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
  
    GCCauseSetter gccs(heap, _gc_cause);
    _result = heap->failed_mem_allocate(_word_size);
  
    if (_result == NULL && GC_locker::is_active_and_needs_gc()) {
*** 61,73 ****
  }
  
  void VM_ParallelGCSystemGC::doit() {
    SvcGCMarker sgcm(SvcGCMarker::FULL);
  
!   ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap,
!     "must be a ParallelScavengeHeap");
  
    GCCauseSetter gccs(heap, _gc_cause);
    if (_gc_cause == GCCause::_gc_locker || _gc_cause == GCCause::_wb_young_gc
        DEBUG_ONLY(|| _gc_cause == GCCause::_scavenge_alot)) {
      // If (and only if) the scavenge fails, this will invoke a full gc.
--- 60,70 ----
  }
  
  void VM_ParallelGCSystemGC::doit() {
    SvcGCMarker sgcm(SvcGCMarker::FULL);
  
!   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
  
    GCCauseSetter gccs(heap, _gc_cause);
    if (_gc_cause == GCCause::_gc_locker || _gc_cause == GCCause::_wb_young_gc
        DEBUG_ONLY(|| _gc_cause == GCCause::_scavenge_alot)) {
      // If (and only if) the scavenge fails, this will invoke a full gc.