src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp

*** 48,58 ****
  inline size_t G1BlockOffsetSharedArray::index_for(const void* p) const {
    char* pc = (char*)p;
    assert(pc >= (char*)_reserved.start() &&
           pc <  (char*)_reserved.end(),
           err_msg("p (" PTR_FORMAT ") not in reserved [" PTR_FORMAT ", " PTR_FORMAT ")",
!                  p, (char*)_reserved.start(), (char*)_reserved.end()));
    size_t delta = pointer_delta(pc, _reserved.start(), sizeof(char));
    size_t result = delta >> LogN;
    check_index(result, "bad index from address");
    return result;
  }
--- 48,58 ----
  inline size_t G1BlockOffsetSharedArray::index_for(const void* p) const {
    char* pc = (char*)p;
    assert(pc >= (char*)_reserved.start() &&
           pc <  (char*)_reserved.end(),
           err_msg("p (" PTR_FORMAT ") not in reserved [" PTR_FORMAT ", " PTR_FORMAT ")",
!                  p2i(p), p2i(_reserved.start()), p2i(_reserved.end())));
    size_t delta = pointer_delta(pc, _reserved.start(), sizeof(char));
    size_t result = delta >> LogN;
    check_index(result, "bad index from address");
    return result;
  }
*** 63,73 ****
    HeapWord* result = _reserved.start() + (index << LogN_words);
    assert(result >= _reserved.start() && result < _reserved.end(),
           err_msg("bad address from index result " PTR_FORMAT
                   " _reserved.start() " PTR_FORMAT " _reserved.end() "
                   PTR_FORMAT,
!                  result, _reserved.start(), _reserved.end()));
    return result;
  }
  
  inline HeapWord*
  G1BlockOffsetArray::block_at_or_preceding(const void* addr,
--- 63,73 ----
    HeapWord* result = _reserved.start() + (index << LogN_words);
    assert(result >= _reserved.start() && result < _reserved.end(),
           err_msg("bad address from index result " PTR_FORMAT
                   " _reserved.start() " PTR_FORMAT " _reserved.end() "
                   PTR_FORMAT,
!                  p2i(result), p2i(_reserved.start()), p2i(_reserved.end())));
    return result;
  }
  
  inline HeapWord*
  G1BlockOffsetArray::block_at_or_preceding(const void* addr,