# HG changeset patch
# User ysr
# Date 1253058650 25200
# Node ID eb058abd0562a6d8b8f287ae6172fbacf7fb6eb3
# Parent  68ef3fdcdb76321f68ac8a1a6807c6b41dfc75e1
6861557: G1: assert(top() == bottom() || zfs == Allocated,"Region must be empty, or ...")
Summary: Druing heap shrinking, check for emptiness of a region before modifying its ZF status.
Reviewed-by: tonyp

diff -r 68ef3fdcdb76 -r eb058abd0562 src/share/vm/gc_implementation/g1/heapRegionSeq.cpp
--- a/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp	Thu Sep 10 16:46:17 2009 -0700
+++ b/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp	Tue Sep 15 16:50:50 2009 -0700
@@ -302,9 +302,9 @@
     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();