Merge
authorcoleenp
Wed, 04 Nov 2015 19:52:04 +0000
changeset 33764 a75559af2868
parent 33763 cec2333f839c (current diff)
parent 33757 a3ff821552b7 (diff)
child 33765 f42c3efc2b1b
Merge
--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Wed Nov 04 14:32:51 2015 -0500
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Wed Nov 04 19:52:04 2015 +0000
@@ -3613,7 +3613,7 @@
           // The remembered set might contain references to already freed
           // regions. Filter out such entries to avoid failing card table
           // verification.
-          if (!g1h->heap_region_containing(bs->addr_for(card_ptr))->is_free()) {
+          if (g1h->is_in_closed_subset(bs->addr_for(card_ptr))) {
             if (*card_ptr != CardTableModRefBS::dirty_card_val()) {
               *card_ptr = CardTableModRefBS::dirty_card_val();
               _dcq.enqueue(card_ptr);