commit 759740976be0bb7da8f3f4a7491cca7055201dfb
author Erik Helin <ehelin@openjdk.org> Fri Jan 16 14:43:45 2015 +0100
committer Erik Helin <ehelin@openjdk.org> Fri Jan 16 14:43:45 2015 +0100
tree c5757bf5de481cf3f6d6b44440719b5535801632
parent c671f2ff048902fe19414a3b39fd720fad0e66e0

8068971: A heap region being cleared should not belong to the cset

Reviewed-by: brutisso, tschatzl

hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp

diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
index 5ead54b..d5eaf9f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
@@ -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);