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

rev 12854 : [mq]: gcinterface.patch

*** 242,254 ****
  // Action_verify - BOT verification.
  void
  BlockOffsetArray::do_block_internal(HeapWord* blk_start,
                                      HeapWord* blk_end,
                                      Action action, bool reducing) {
!   assert(Universe::heap()->is_in_reserved(blk_start),
           "reference must be into the heap");
!   assert(Universe::heap()->is_in_reserved(blk_end-1),
           "limit must be within the heap");
    // This is optimized to make the test fast, assuming we only rarely
    // cross boundaries.
    uintptr_t end_ui = (uintptr_t)(blk_end - 1);
    uintptr_t start_ui = (uintptr_t)blk_start;
--- 242,254 ----
  // Action_verify - BOT verification.
  void
  BlockOffsetArray::do_block_internal(HeapWord* blk_start,
                                      HeapWord* blk_end,
                                      Action action, bool reducing) {
!   assert(GC::gc()->heap()->is_in_reserved(blk_start),
           "reference must be into the heap");
!   assert(GC::gc()->heap()->is_in_reserved(blk_end-1),
           "limit must be within the heap");
    // This is optimized to make the test fast, assuming we only rarely
    // cross boundaries.
    uintptr_t end_ui = (uintptr_t)(blk_end - 1);
    uintptr_t start_ui = (uintptr_t)blk_start;
*** 716,728 ****
           "should be past threshold");
    assert(blk_start <= _next_offset_threshold,
           "blk_start should be at or before threshold");
    assert(pointer_delta(_next_offset_threshold, blk_start) <= BOTConstants::N_words,
           "offset should be <= BlockOffsetSharedArray::N");
!   assert(Universe::heap()->is_in_reserved(blk_start),
           "reference must be into the heap");
!   assert(Universe::heap()->is_in_reserved(blk_end-1),
           "limit must be within the heap");
    assert(_next_offset_threshold ==
           _array->_reserved.start() + _next_offset_index*BOTConstants::N_words,
           "index must agree with threshold");
  
--- 716,728 ----
           "should be past threshold");
    assert(blk_start <= _next_offset_threshold,
           "blk_start should be at or before threshold");
    assert(pointer_delta(_next_offset_threshold, blk_start) <= BOTConstants::N_words,
           "offset should be <= BlockOffsetSharedArray::N");
!   assert(GC::gc()->heap()->is_in_reserved(blk_start),
           "reference must be into the heap");
!   assert(GC::gc()->heap()->is_in_reserved(blk_end-1),
           "limit must be within the heap");
    assert(_next_offset_threshold ==
           _array->_reserved.start() + _next_offset_index*BOTConstants::N_words,
           "index must agree with threshold");
  
*** 773,793 ****
    }
  #endif
  }
  
  HeapWord* BlockOffsetArrayContigSpace::initialize_threshold() {
!   assert(!Universe::heap()->is_in_reserved(_array->_offset_array),
           "just checking");
    _next_offset_index = _array->index_for(_bottom);
    _next_offset_index++;
    _next_offset_threshold =
      _array->address_for_index(_next_offset_index);
    return _next_offset_threshold;
  }
  
  void BlockOffsetArrayContigSpace::zero_bottom_entry() {
!   assert(!Universe::heap()->is_in_reserved(_array->_offset_array),
           "just checking");
    size_t bottom_index = _array->index_for(_bottom);
    _array->set_offset_array(bottom_index, 0);
  }
  
--- 773,793 ----
    }
  #endif
  }
  
  HeapWord* BlockOffsetArrayContigSpace::initialize_threshold() {
!   assert(!GC::gc()->heap()->is_in_reserved(_array->_offset_array),
           "just checking");
    _next_offset_index = _array->index_for(_bottom);
    _next_offset_index++;
    _next_offset_threshold =
      _array->address_for_index(_next_offset_index);
    return _next_offset_threshold;
  }
  
  void BlockOffsetArrayContigSpace::zero_bottom_entry() {
!   assert(!GC::gc()->heap()->is_in_reserved(_array->_offset_array),
           "just checking");
    size_t bottom_index = _array->index_for(_bottom);
    _array->set_offset_array(bottom_index, 0);
  }