Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp	Thu Apr 03 10:39:27 2014 +0200
     1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp	Thu Apr 03 16:20:16 2014 +0200
     1.3 @@ -30,7 +30,7 @@
     1.4  inline void HeapRegionSetBase::add(HeapRegion* hr) {
     1.5    check_mt_safety();
     1.6    assert(hr->containing_set() == NULL, hrs_ext_msg(this, "should not already have a containing set %u"));
     1.7 -  assert(hr->next() == NULL, hrs_ext_msg(this, "should not already be linked"));
     1.8 +  assert(hr->next() == NULL && hr->prev() == NULL, hrs_ext_msg(this, "should not already be linked"));
     1.9  
    1.10    _count.increment(1u, hr->capacity());
    1.11    hr->set_containing_set(this);
    1.12 @@ -40,7 +40,7 @@
    1.13  inline void HeapRegionSetBase::remove(HeapRegion* hr) {
    1.14    check_mt_safety();
    1.15    verify_region(hr);
    1.16 -  assert(hr->next() == NULL, hrs_ext_msg(this, "should already be unlinked"));
    1.17 +  assert(hr->next() == NULL && hr->prev() == NULL, hrs_ext_msg(this, "should already be unlinked"));
    1.18  
    1.19    hr->set_containing_set(NULL);
    1.20    assert(_count.length() > 0, hrs_ext_msg(this, "pre-condition"));