src/share/vm/memory/cardTableModRefBS.cpp

*** 114,124 ****
    jbyte* guard_card = &_byte_map[_guard_index];
    uintptr_t guard_page = align_size_down((uintptr_t)guard_card, _page_size);
    _guard_region = MemRegion((HeapWord*)guard_page, _page_size);
    if (!os::commit_memory((char*)guard_page, _page_size, _page_size)) {
      // Do better than this for Merlin
!     vm_exit_out_of_memory(_page_size, "card table last card");
    }
  
    *guard_card = last_card;
  
     _lowest_non_clean =
--- 114,124 ----
    jbyte* guard_card = &_byte_map[_guard_index];
    uintptr_t guard_page = align_size_down((uintptr_t)guard_card, _page_size);
    _guard_region = MemRegion((HeapWord*)guard_page, _page_size);
    if (!os::commit_memory((char*)guard_page, _page_size, _page_size)) {
      // Do better than this for Merlin
!     vm_exit_out_of_memory(_page_size, OOM_MMAP_ERROR, "card table last card");
    }
  
    *guard_card = last_card;
  
     _lowest_non_clean =
*** 290,300 ****
  
        assert(!new_committed.is_empty(), "Region should not be empty here");
        if (!os::commit_memory((char*)new_committed.start(),
                               new_committed.byte_size(), _page_size)) {
          // Do better than this for Merlin
!         vm_exit_out_of_memory(new_committed.byte_size(),
                  "card table expansion");
        }
      // Use new_end_aligned (as opposed to new_end_for_commit) because
      // the cur_committed region may include the guard region.
      } else if (new_end_aligned < cur_committed.end()) {
--- 290,300 ----
  
        assert(!new_committed.is_empty(), "Region should not be empty here");
        if (!os::commit_memory((char*)new_committed.start(),
                               new_committed.byte_size(), _page_size)) {
          // Do better than this for Merlin
!         vm_exit_out_of_memory(new_committed.byte_size(), OOM_MMAP_ERROR,
                  "card table expansion");
        }
      // Use new_end_aligned (as opposed to new_end_for_commit) because
      // the cur_committed region may include the guard region.
      } else if (new_end_aligned < cur_committed.end()) {