Merge
authoracorn
Fri Sep 18 15:14:50 2009 -0400 (6 months ago)
changeset 976723131383de6
parent 97583c29a26f67c
parent 961d7c9544cc141
child 978d72ba3205918
child 99354b3b351d6f9
Merge
--- a/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp Wed Sep 16 15:42:46 2009 -0400
+++ b/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp Fri Sep 18 15:14:50 2009 -0400
@@ -302,9 +302,9 @@ MemRegion HeapRegionSeq::shrink_by(size_
if (cur->isHumongous()) {
return MemRegion(last_start, end);
}
- cur->reset_zero_fill();
assert(cur == _regions.top(), "Should be top");
if (!cur->is_empty()) break;
+ cur->reset_zero_fill();
shrink_bytes -= cur->capacity();
num_regions_deleted++;
_regions.pop();