src/share/vm/memory/metaspace.cpp

*** 3341,3351 ****
        size_t cds_total = MetaspaceShared::core_spaces_size();
        cds_address = (address)mapinfo->header()->region_addr(0);
  #ifdef _LP64
        if (using_class_space()) {
          char* cds_end = (char*)(cds_address + cds_total);
!         cds_end = (char *)align_ptr_up(cds_end, _reserve_alignment);
          // If UseCompressedClassPointers is set then allocate the metaspace area
          // above the heap and above the CDS area (if it exists).
          allocate_metaspace_compressed_klass_ptrs(cds_end, cds_address);
          // Map the shared string space after compressed pointers
          // because it relies on compressed class pointers setting to work
--- 3341,3351 ----
        size_t cds_total = MetaspaceShared::core_spaces_size();
        cds_address = (address)mapinfo->header()->region_addr(0);
  #ifdef _LP64
        if (using_class_space()) {
          char* cds_end = (char*)(cds_address + cds_total);
!         cds_end = (char *)align_up(cds_end, _reserve_alignment);
          // If UseCompressedClassPointers is set then allocate the metaspace area
          // above the heap and above the CDS area (if it exists).
          allocate_metaspace_compressed_klass_ptrs(cds_end, cds_address);
          // Map the shared string space after compressed pointers
          // because it relies on compressed class pointers setting to work
*** 3362,3371 ****
--- 3362,3372 ----
  #ifdef _LP64
    if (!UseSharedSpaces && using_class_space()) {
      if (DumpSharedSpaces) {
        // Already initialized inside MetaspaceShared::initialize_shared_rs()
      } else {
+       char* base = (char*)align_up(Universe::heap()->reserved_region().end(), _reserve_alignment);
        allocate_metaspace_compressed_klass_ptrs(base, 0);
      }
    }
  #endif // _LP64
  
*** 3379,3389 ****
                                       (CompressedClassSpaceSize/BytesPerWord)*2);
    _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size);
    // Arbitrarily set the initial virtual space to a multiple
    // of the boot class loader size.
    size_t word_size = VIRTUALSPACEMULTIPLIER * _first_chunk_word_size;
!   word_size = align_size_up(word_size, Metaspace::reserve_alignment_words());
  
    // Initialize the list of virtual spaces.
    _space_list = new VirtualSpaceList(word_size);
    _chunk_manager_metadata = new ChunkManager(SpecializedChunk, SmallChunk, MediumChunk);
  
--- 3380,3390 ----
                                       (CompressedClassSpaceSize/BytesPerWord)*2);
    _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size);
    // Arbitrarily set the initial virtual space to a multiple
    // of the boot class loader size.
    size_t word_size = VIRTUALSPACEMULTIPLIER * _first_chunk_word_size;
!   word_size = align_up(word_size, Metaspace::reserve_alignment_words());
  
    // Initialize the list of virtual spaces.
    _space_list = new VirtualSpaceList(word_size);
    _chunk_manager_metadata = new ChunkManager(SpecializedChunk, SmallChunk, MediumChunk);