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

*** 101,111 ****
    // Generation Counters - generation 0, 3 subspaces
    _gen_counters = new PSGenerationCounters("new", 0, 3, _virtual_space);
  
    // Compute maximum space sizes for performance counters
    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   size_t alignment = heap->intra_heap_alignment();
    size_t size = virtual_space()->reserved_size();
  
    size_t max_survivor_size;
    size_t max_eden_size;
  
--- 101,111 ----
    // Generation Counters - generation 0, 3 subspaces
    _gen_counters = new PSGenerationCounters("new", 0, 3, _virtual_space);
  
    // Compute maximum space sizes for performance counters
    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   size_t alignment = heap->space_alignment();
    size_t size = virtual_space()->reserved_size();
  
    size_t max_survivor_size;
    size_t max_eden_size;
  
*** 154,165 ****
  void PSYoungGen::compute_initial_space_boundaries() {
    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
    assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
  
    // Compute sizes
!   size_t alignment = heap->intra_heap_alignment();
    size_t size = virtual_space()->committed_size();
  
    size_t survivor_size = size / InitialSurvivorRatio;
    survivor_size = align_size_down(survivor_size, alignment);
    // ... but never less than an alignment
    survivor_size = MAX2(survivor_size, alignment);
--- 154,166 ----
  void PSYoungGen::compute_initial_space_boundaries() {
    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
    assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
  
    // Compute sizes
!   size_t alignment = heap->space_alignment();
    size_t size = virtual_space()->committed_size();
+   assert(size >= 3 * alignment, "Young space is not large enough for eden + 2 survivors");
  
    size_t survivor_size = size / InitialSurvivorRatio;
    survivor_size = align_size_down(survivor_size, alignment);
    // ... but never less than an alignment
    survivor_size = MAX2(survivor_size, alignment);
*** 205,215 ****
  }
  
  #ifndef PRODUCT
  void PSYoungGen::space_invariants() {
    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   const size_t alignment = heap->intra_heap_alignment();
  
    // Currently, our eden size cannot shrink to zero
    guarantee(eden_space()->capacity_in_bytes() >= alignment, "eden too small");
    guarantee(from_space()->capacity_in_bytes() >= alignment, "from too small");
    guarantee(to_space()->capacity_in_bytes() >= alignment, "to too small");
--- 206,216 ----
  }
  
  #ifndef PRODUCT
  void PSYoungGen::space_invariants() {
    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   const size_t alignment = heap->space_alignment();
  
    // Currently, our eden size cannot shrink to zero
    guarantee(eden_space()->capacity_in_bytes() >= alignment, "eden too small");
    guarantee(from_space()->capacity_in_bytes() >= alignment, "from too small");
    guarantee(to_space()->capacity_in_bytes() >= alignment, "to too small");
*** 489,499 ****
    char* from_end   = (char*)from_space()->end();
    char* to_start   = (char*)to_space()->bottom();
    char* to_end     = (char*)to_space()->end();
  
    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   const size_t alignment = heap->intra_heap_alignment();
    const bool maintain_minimum =
      (requested_eden_size + 2 * requested_survivor_size) <= min_gen_size();
  
    bool eden_from_to_order = from_start < to_start;
    // Check whether from space is below to space
--- 490,500 ----
    char* from_end   = (char*)from_space()->end();
    char* to_start   = (char*)to_space()->bottom();
    char* to_end     = (char*)to_space()->end();
  
    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   const size_t alignment = heap->space_alignment();
    const bool maintain_minimum =
      (requested_eden_size + 2 * requested_survivor_size) <= min_gen_size();
  
    bool eden_from_to_order = from_start < to_start;
    // Check whether from space is below to space
*** 838,849 ****
  // any shrinkage of the young gen is limited by location of
  // from-space.
  size_t PSYoungGen::available_to_live() {
    size_t delta_in_survivor = 0;
    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   const size_t space_alignment = heap->intra_heap_alignment();
!   const size_t gen_alignment = heap->young_gen_alignment();
  
    MutableSpace* space_shrinking = NULL;
    if (from_space()->end() > to_space()->end()) {
      space_shrinking = from_space();
    } else {
--- 839,850 ----
  // any shrinkage of the young gen is limited by location of
  // from-space.
  size_t PSYoungGen::available_to_live() {
    size_t delta_in_survivor = 0;
    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   const size_t space_alignment = heap->space_alignment();
!   const size_t gen_alignment = heap->generation_alignment();
  
    MutableSpace* space_shrinking = NULL;
    if (from_space()->end() > to_space()->end()) {
      space_shrinking = from_space();
    } else {