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

rev 8978 : imported patch remove_err_msg

*** 34,56 ****
  }
  
  #ifndef PRODUCT
  void G1BiasedMappedArrayBase::verify_index(idx_t index) const {
    guarantee(_base != NULL, "Array not initialized");
!   guarantee(index < length(), err_msg("Index out of bounds index: " SIZE_FORMAT " length: " SIZE_FORMAT, index, length()));
  }
  
  void G1BiasedMappedArrayBase::verify_biased_index(idx_t biased_index) const {
    guarantee(_biased_base != NULL, "Array not initialized");
    guarantee(biased_index >= bias() && biased_index < (bias() + length()),
!     err_msg("Biased index out of bounds, index: " SIZE_FORMAT " bias: " SIZE_FORMAT " length: " SIZE_FORMAT, biased_index, bias(), length()));
  }
  
  void G1BiasedMappedArrayBase::verify_biased_index_inclusive_end(idx_t biased_index) const {
    guarantee(_biased_base != NULL, "Array not initialized");
    guarantee(biased_index >= bias() && biased_index <= (bias() + length()),
!     err_msg("Biased index out of inclusive bounds, index: " SIZE_FORMAT " bias: " SIZE_FORMAT " length: " SIZE_FORMAT, biased_index, bias(), length()));
  }
  
  class TestMappedArray : public G1BiasedMappedArray<int> {
  protected:
    virtual int default_value() const { return 0xBAADBABE; }
--- 34,56 ----
  }
  
  #ifndef PRODUCT
  void G1BiasedMappedArrayBase::verify_index(idx_t index) const {
    guarantee(_base != NULL, "Array not initialized");
!   guarantee(index < length(), "Index out of bounds index: " SIZE_FORMAT " length: " SIZE_FORMAT, index, length());
  }
  
  void G1BiasedMappedArrayBase::verify_biased_index(idx_t biased_index) const {
    guarantee(_biased_base != NULL, "Array not initialized");
    guarantee(biased_index >= bias() && biased_index < (bias() + length()),
!     "Biased index out of bounds, index: " SIZE_FORMAT " bias: " SIZE_FORMAT " length: " SIZE_FORMAT, biased_index, bias(), length());
  }
  
  void G1BiasedMappedArrayBase::verify_biased_index_inclusive_end(idx_t biased_index) const {
    guarantee(_biased_base != NULL, "Array not initialized");
    guarantee(biased_index >= bias() && biased_index <= (bias() + length()),
!     "Biased index out of inclusive bounds, index: " SIZE_FORMAT " bias: " SIZE_FORMAT " length: " SIZE_FORMAT, biased_index, bias(), length());
  }
  
  class TestMappedArray : public G1BiasedMappedArray<int> {
  protected:
    virtual int default_value() const { return 0xBAADBABE; }
*** 63,73 ****
      TestMappedArray array;
      array.initialize(fake_heap, fake_heap + REGION_SIZE_IN_WORDS * NUM_REGIONS,
              REGION_SIZE_IN_WORDS * HeapWordSize);
      // Check address calculation (bounds)
      assert(array.bottom_address_mapped() == fake_heap,
!       err_msg("bottom mapped address should be " PTR_FORMAT ", but is " PTR_FORMAT, p2i(fake_heap), p2i(array.bottom_address_mapped())));
      assert(array.end_address_mapped() == (fake_heap + REGION_SIZE_IN_WORDS * NUM_REGIONS), "must be");
  
      int* bottom = array.address_mapped_to(fake_heap);
      assert((void*)bottom == (void*) array.base(), "must be");
      int* end = array.address_mapped_to(fake_heap + REGION_SIZE_IN_WORDS * NUM_REGIONS);
--- 63,73 ----
      TestMappedArray array;
      array.initialize(fake_heap, fake_heap + REGION_SIZE_IN_WORDS * NUM_REGIONS,
              REGION_SIZE_IN_WORDS * HeapWordSize);
      // Check address calculation (bounds)
      assert(array.bottom_address_mapped() == fake_heap,
!            "bottom mapped address should be " PTR_FORMAT ", but is " PTR_FORMAT, p2i(fake_heap), p2i(array.bottom_address_mapped()));
      assert(array.end_address_mapped() == (fake_heap + REGION_SIZE_IN_WORDS * NUM_REGIONS), "must be");
  
      int* bottom = array.address_mapped_to(fake_heap);
      assert((void*)bottom == (void*) array.base(), "must be");
      int* end = array.address_mapped_to(fake_heap + REGION_SIZE_IN_WORDS * NUM_REGIONS);