src/share/vm/gc/shared/genCollectedHeap.cpp

rev 8978 : imported patch remove_err_msg

*** 160,171 ****
    if (total_reserved < young_spec->max_size()) {
      vm_exit_during_initialization("The size of the object heap + VM data exceeds "
                                    "the maximum representable size");
    }
    assert(total_reserved % alignment == 0,
!          err_msg("Gen size; total_reserved=" SIZE_FORMAT ", alignment="
!                  SIZE_FORMAT, total_reserved, alignment));
  
    *heap_rs = Universe::reserve_heap(total_reserved, alignment);
    return heap_rs->base();
  }
  
--- 160,171 ----
    if (total_reserved < young_spec->max_size()) {
      vm_exit_during_initialization("The size of the object heap + VM data exceeds "
                                    "the maximum representable size");
    }
    assert(total_reserved % alignment == 0,
!          "Gen size; total_reserved=" SIZE_FORMAT ", alignment="
!          SIZE_FORMAT, total_reserved, alignment);
  
    *heap_rs = Universe::reserve_heap(total_reserved, alignment);
    return heap_rs->base();
  }
  
*** 889,899 ****
  }
  
  bool GenCollectedHeap::is_in_young(oop p) {
    bool result = ((HeapWord*)p) < _old_gen->reserved().start();
    assert(result == _young_gen->is_in_reserved(p),
!          err_msg("incorrect test - result=%d, p=" INTPTR_FORMAT, result, p2i((void*)p)));
    return result;
  }
  
  // Returns "TRUE" iff "p" points into the committed areas of the heap.
  bool GenCollectedHeap::is_in(const void* p) const {
--- 889,899 ----
  }
  
  bool GenCollectedHeap::is_in_young(oop p) {
    bool result = ((HeapWord*)p) < _old_gen->reserved().start();
    assert(result == _young_gen->is_in_reserved(p),
!          "incorrect test - result=%d, p=" INTPTR_FORMAT, result, p2i((void*)p));
    return result;
  }
  
  // Returns "TRUE" iff "p" points into the committed areas of the heap.
  bool GenCollectedHeap::is_in(const void* p) const {