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

rev 11777 : [mq]: gcinterface.patch

*** 297,307 ****
    if (new_tlab_size == 0) {
      return NULL;
    }
  
    // Allocate a new TLAB...
!   HeapWord* obj = Universe::heap()->allocate_new_tlab(new_tlab_size);
    if (obj == NULL) {
      return NULL;
    }
  
    AllocTracer::send_allocation_in_new_tlab_event(klass, new_tlab_size * HeapWordSize, size * HeapWordSize);
--- 297,307 ----
    if (new_tlab_size == 0) {
      return NULL;
    }
  
    // Allocate a new TLAB...
!   HeapWord* obj = GC::gc()->heap()->allocate_new_tlab(new_tlab_size);
    if (obj == NULL) {
      return NULL;
    }
  
    AllocTracer::send_allocation_in_new_tlab_event(klass, new_tlab_size * HeapWordSize, size * HeapWordSize);
*** 439,450 ****
  #ifdef ASSERT
  void CollectedHeap::fill_args_check(HeapWord* start, size_t words)
  {
    assert(words >= min_fill_size(), "too small to fill");
    assert(words % MinObjAlignment == 0, "unaligned size");
!   assert(Universe::heap()->is_in_reserved(start), "not in heap");
!   assert(Universe::heap()->is_in_reserved(start + words - 1), "not in heap");
  }
  
  void CollectedHeap::zap_filler_array(HeapWord* start, size_t words, bool zap)
  {
    if (ZapFillerObjects && zap) {
--- 439,450 ----
  #ifdef ASSERT
  void CollectedHeap::fill_args_check(HeapWord* start, size_t words)
  {
    assert(words >= min_fill_size(), "too small to fill");
    assert(words % MinObjAlignment == 0, "unaligned size");
!   assert(GC::gc()->heap()->is_in_reserved(start), "not in heap");
!   assert(GC::gc()->heap()->is_in_reserved(start + words - 1), "not in heap");
  }
  
  void CollectedHeap::zap_filler_array(HeapWord* start, size_t words, bool zap)
  {
    if (ZapFillerObjects && zap) {
*** 604,614 ****
  
  /////////////// Unit tests ///////////////
  
  #ifndef PRODUCT
  void CollectedHeap::test_is_in() {
!   CollectedHeap* heap = Universe::heap();
  
    uintptr_t epsilon    = (uintptr_t) MinObjAlignment;
    uintptr_t heap_start = (uintptr_t) heap->_reserved.start();
    uintptr_t heap_end   = (uintptr_t) heap->_reserved.end();
  
--- 604,614 ----
  
  /////////////// Unit tests ///////////////
  
  #ifndef PRODUCT
  void CollectedHeap::test_is_in() {
!   CollectedHeap* heap = GC::gc()->heap();
  
    uintptr_t epsilon    = (uintptr_t) MinObjAlignment;
    uintptr_t heap_start = (uintptr_t) heap->_reserved.start();
    uintptr_t heap_end   = (uintptr_t) heap->_reserved.end();