7195823: NPG: CMS reserved() doesn't match _rs.base().

Mon, 03 Sep 2012 18:37:12 -0400

author
coleenp
date
Mon, 03 Sep 2012 18:37:12 -0400
changeset 4038
03049e0e8544
parent 4037
da91efe96a93
child 4039
46c017102631

7195823: NPG: CMS reserved() doesn't match _rs.base().
Summary: If the commit fails, the size isn't set so the assert fails.
Reviewed-by: kamg

src/share/vm/memory/metaspace.cpp file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/vm/memory/metaspace.cpp	Sat Sep 01 13:25:18 2012 -0400
     1.2 +++ b/src/share/vm/memory/metaspace.cpp	Mon Sep 03 18:37:12 2012 -0400
     1.3 @@ -1077,16 +1077,16 @@
     1.4      set_top((MetaWord*)virtual_space()->low());
     1.5      set_reserved(MemRegion((HeapWord*)_rs.base(),
     1.6                   (HeapWord*)(_rs.base() + _rs.size())));
     1.7 +
     1.8 +    assert(reserved()->start() == (HeapWord*) _rs.base(),
     1.9 +      err_msg("Reserved start was not set properly " PTR_FORMAT
    1.10 +        " != " PTR_FORMAT, reserved()->start(), _rs.base()));
    1.11 +    assert(reserved()->word_size() == _rs.size() / BytesPerWord,
    1.12 +      err_msg("Reserved size was not set properly " SIZE_FORMAT
    1.13 +        " != " SIZE_FORMAT, reserved()->word_size(),
    1.14 +        _rs.size() / BytesPerWord));
    1.15    }
    1.16  
    1.17 -  assert(reserved()->start() == (HeapWord*) _rs.base(),
    1.18 -    err_msg("Reserved start was not set properly " PTR_FORMAT
    1.19 -      " != " PTR_FORMAT, reserved()->start(), _rs.base()));
    1.20 -  assert(reserved()->word_size() == _rs.size() / BytesPerWord,
    1.21 -    err_msg("Reserved size was not set properly " SIZE_FORMAT
    1.22 -      " != " SIZE_FORMAT, reserved()->word_size(),
    1.23 -      _rs.size() / BytesPerWord));
    1.24 -
    1.25    return result;
    1.26  }
    1.27  

mercurial