src/share/vm/memory/heap.cpp

rev 7181 : 8049864: TestParallelHeapSizeFlags fails with unexpected heap size
Reviewed-by: sjohanss, jmasa

*** 95,107 ****
  
    _segment_size      = segment_size;
    _log2_segment_size = exact_log2(segment_size);
  
    // Reserve and initialize space for _memory.
!   const size_t page_size = os::can_execute_large_page_memory() ?
!           os::page_size_for_region(committed_size, reserved_size, 8) :
!           os::vm_page_size();
    const size_t granularity = os::vm_allocation_granularity();
    const size_t r_align = MAX2(page_size, granularity);
    const size_t r_size = align_size_up(reserved_size, r_align);
    const size_t c_size = align_size_up(committed_size, page_size);
  
--- 95,111 ----
  
    _segment_size      = segment_size;
    _log2_segment_size = exact_log2(segment_size);
  
    // Reserve and initialize space for _memory.
!   size_t page_size = os::vm_page_size();
!   if (os::can_execute_large_page_memory()) {
!     const size_t min_pages = 8;
!     page_size = MIN2(os::page_size_for_region(committed_size, min_pages),
!                      os::page_size_for_region(reserved_size, min_pages));
!   }
! 
    const size_t granularity = os::vm_allocation_granularity();
    const size_t r_align = MAX2(page_size, granularity);
    const size_t r_size = align_size_up(reserved_size, r_align);
    const size_t c_size = align_size_up(committed_size, page_size);