# HG changeset patch
# User ehelin
# Date 1421415825 -3600
# Node ID f346493c0f7d5565d510ee39688a6656ca82840e
# Parent  8a075d011b3154000a333354f46c28df4be3786d
8068971: A heap region being cleared should not belong to the cset
Reviewed-by: brutisso, tschatzl

diff -r 8a075d011b31 -r f346493c0f7d hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	Fri Jan 16 10:32:40 2015 +0000
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	Fri Jan 16 14:43:45 2015 +0100
@@ -162,8 +162,8 @@
          "we should have already filtered out humongous regions");
   assert(_end == orig_end(),
          "we should have already filtered out humongous regions");
-
-  _in_collection_set = false;
+  assert(!_in_collection_set,
+         err_msg("Should not clear heap region %u in the collection set", hrm_index()));
 
   set_allocation_context(AllocationContext::system());
   set_young_index_in_cset(-1);