Merge
authorjlaskey
Fri, 04 Sep 2015 20:29:48 +0000
changeset 32620 d7bbbe43614e
parent 32619 47acec81dcca (current diff)
parent 32618 bbbe25551000 (diff)
child 32621 cdab920f3b6c
Merge
--- a/hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp	Fri Sep 04 10:12:08 2015 -0300
+++ b/hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp	Fri Sep 04 20:29:48 2015 +0000
@@ -89,7 +89,7 @@
     CheckForUnmarkedOops object_check(_young_gen, _card_table);
     obj->oop_iterate_no_header(&object_check);
     if (object_check.has_unmarked_oop()) {
-      assert(_card_table->addr_is_marked_imprecise(obj), "Found unmarked young_gen object");
+      guarantee(_card_table->addr_is_marked_imprecise(obj), "Found unmarked young_gen object");
     }
   }
 };