# HG changeset patch
# User jlaskey
# Date 1441398588 0
# Node ID a78dd396f8a44cd727400eaae0fe4d4eae2f9f81
# Parent  262b86c271b0bf05ecfba7129e3a5087bee89a7e# Parent  67967c7b055c5da781115fb2f68ddb0083961de3
Merge

diff -r 262b86c271b0 -r a78dd396f8a4 src/share/vm/gc/parallel/cardTableExtension.cpp
--- a/src/share/vm/gc/parallel/cardTableExtension.cpp	Fri Sep 04 10:12:08 2015 -0300
+++ b/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");
     }
   }
 };