*** old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Mon Apr 29 18:21:23 2013
--- new/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Mon Apr 29 18:21:21 2013

*** 1829,1839 ****
--- 1829,1839 ----
      // The expansion of the virtual storage space was unsuccessful.
      // Let's see if it was because we ran out of swap.
      if (G1ExitOnExpansionFailure &&
          _g1_storage.uncommitted_size() >= aligned_expand_bytes) {
        // We had head room...
!       vm_exit_out_of_memory(aligned_expand_bytes, OOM_MMAP_ERROR, "G1 heap expansion");
      }
    }
    return successful;
  }
  

*** 3612,3622 ****
--- 3612,3622 ----
  G1CollectedHeap::setup_surviving_young_words() {
    assert(_surviving_young_words == NULL, "pre-condition");
    uint array_length = g1_policy()->young_cset_region_length();
    _surviving_young_words = NEW_C_HEAP_ARRAY(size_t, (size_t) array_length, mtGC);
    if (_surviving_young_words == NULL) {
!     vm_exit_out_of_memory(sizeof(size_t) * array_length, OOM_MALLOC_ERROR,
                            "Not enough space for young surv words summary.");
    }
    memset(_surviving_young_words, 0, (size_t) array_length * sizeof(size_t));
  #ifdef ASSERT
    for (uint i = 0;  i < array_length; ++i) {

*** 4395,4405 ****
--- 4395,4405 ----
    uint array_length = PADDING_ELEM_NUM +
                        real_length +
                        PADDING_ELEM_NUM;
    _surviving_young_words_base = NEW_C_HEAP_ARRAY(size_t, array_length, mtGC);
    if (_surviving_young_words_base == NULL)
!     vm_exit_out_of_memory(array_length * sizeof(size_t), OOM_MALLOC_ERROR,
                            "Not enough space for young surv histo.");
    _surviving_young_words = _surviving_young_words_base + PADDING_ELEM_NUM;
    memset(_surviving_young_words, 0, (size_t) real_length * sizeof(size_t));
  
    _alloc_buffers[GCAllocForSurvived] = &_surviving_alloc_buffer;