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

rev 8068 : imported patch parallelscavenge_cleanup

*** 101,111 ****
  
    _state = flushed;
  }
  
  bool PSPromotionLAB::unallocate_object(HeapWord* obj, size_t obj_size) {
!   assert(Universe::heap()->is_in(obj), "Object outside heap");
  
    if (contains(obj)) {
      HeapWord* object_end = obj + obj_size;
      assert(object_end == top(), "Not matching last allocation");
  
--- 101,111 ----
  
    _state = flushed;
  }
  
  bool PSPromotionLAB::unallocate_object(HeapWord* obj, size_t obj_size) {
!   assert(ParallelScavengeHeap::heap()->is_in(obj), "Object outside heap");
  
    if (contains(obj)) {
      HeapWord* object_end = obj + obj_size;
      assert(object_end == top(), "Not matching last allocation");
  
*** 135,161 ****
  }
  
  #ifdef ASSERT
  
  bool PSYoungPromotionLAB::lab_is_valid(MemRegion lab) {
!   ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
! 
    MutableSpace* to_space = heap->young_gen()->to_space();
    MemRegion used = to_space->used_region();
    if (used.contains(lab)) {
      return true;
    }
  
    return false;
  }
  
  bool PSOldPromotionLAB::lab_is_valid(MemRegion lab) {
-   ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
-   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
    assert(_start_array->covered_region().contains(lab), "Sanity");
  
    PSOldGen* old_gen = heap->old_gen();
    MemRegion used = old_gen->object_space()->used_region();
  
    if (used.contains(lab)) {
      return true;
--- 135,158 ----
  }
  
  #ifdef ASSERT
  
  bool PSYoungPromotionLAB::lab_is_valid(MemRegion lab) {
!   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
    MutableSpace* to_space = heap->young_gen()->to_space();
    MemRegion used = to_space->used_region();
    if (used.contains(lab)) {
      return true;
    }
  
    return false;
  }
  
  bool PSOldPromotionLAB::lab_is_valid(MemRegion lab) {
    assert(_start_array->covered_region().contains(lab), "Sanity");
  
+   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
    PSOldGen* old_gen = heap->old_gen();
    MemRegion used = old_gen->object_space()->used_region();
  
    if (used.contains(lab)) {
      return true;