Mercurial > hg > graal-compiler
diff src/share/vm/memory/cardTableModRefBS.cpp @ 10161:746b070f5022
8011661: Insufficient memory message says "malloc" when sometimes it should say "mmap"
Reviewed-by: coleenp, zgu, hseigel
| author | ccheung |
|---|---|
| date | Tue, 30 Apr 2013 11:56:52 -0700 |
| parents | 5a9fa2ba85f0 |
| children | f9be75d21404 |
line wrap: on
line diff
--- a/src/share/vm/memory/cardTableModRefBS.cpp Tue Apr 30 09:17:06 2013 -0400 +++ b/src/share/vm/memory/cardTableModRefBS.cpp Tue Apr 30 11:56:52 2013 -0700 @@ -116,7 +116,7 @@ _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"); + vm_exit_out_of_memory(_page_size, OOM_MMAP_ERROR, "card table last card"); } *guard_card = last_card; @@ -292,7 +292,7 @@ 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(), + 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