src/share/vm/gc/g1/g1CollectedHeap.cpp

rev 12309 : [mq]: 8169703-crash-with-alwayspretouch

*** 424,435 ****
        // We found something. Make sure these regions are committed, i.e. expand
        // the heap. Alternatively we could do a defragmentation GC.
        log_debug(gc, ergo, heap)("Attempt heap expansion (humongous allocation request failed). Allocation request: " SIZE_FORMAT "B",
                                      word_size * HeapWordSize);
  
! 
!       _hrm.expand_at(first, obj_regions);
        g1_policy()->record_new_heap_size(num_regions());
  
  #ifdef ASSERT
        for (uint i = first; i < first + obj_regions; ++i) {
          HeapRegion* hr = region_at(i);
--- 424,434 ----
        // We found something. Make sure these regions are committed, i.e. expand
        // the heap. Alternatively we could do a defragmentation GC.
        log_debug(gc, ergo, heap)("Attempt heap expansion (humongous allocation request failed). Allocation request: " SIZE_FORMAT "B",
                                      word_size * HeapWordSize);
  
!       _hrm.expand_at(first, obj_regions, workers());
        g1_policy()->record_new_heap_size(num_regions());
  
  #ifdef ASSERT
        for (uint i = first; i < first + obj_regions; ++i) {
          HeapRegion* hr = region_at(i);
*** 737,747 ****
        start_region = _hrm.addr_to_region(start_address);
      }
  
      // Perform the actual region allocation, exiting if it fails.
      // Then note how much new space we have allocated.
!     if (!_hrm.allocate_containing_regions(curr_range, &commits)) {
        return false;
      }
      increase_used(word_size * HeapWordSize);
      if (commits != 0) {
        log_debug(gc, ergo, heap)("Attempt heap expansion (allocate archive regions). Total size: " SIZE_FORMAT "B",
--- 736,746 ----
        start_region = _hrm.addr_to_region(start_address);
      }
  
      // Perform the actual region allocation, exiting if it fails.
      // Then note how much new space we have allocated.
!     if (!_hrm.allocate_containing_regions(curr_range, &commits, workers())) {
        return false;
      }
      increase_used(word_size * HeapWordSize);
      if (commits != 0) {
        log_debug(gc, ergo, heap)("Attempt heap expansion (allocate archive regions). Total size: " SIZE_FORMAT "B",