# HG changeset patch
# User shade
# Date 1379051833 -7200
# Node ID 9cb63cd234a0ffe52c28879160788f85e4bc1482
# Parent  8c5e6482cbfc3852e00d1acfa689c83fd0bf85b3
8024671: G1 generates assert error messages in product builds
Reviewed-by: brutisso, tschatzl

diff -r 8c5e6482cbfc -r 9cb63cd234a0 src/share/vm/gc_implementation/g1/g1CardCounts.cpp
--- a/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	Fri Sep 13 22:25:27 2013 +0200
+++ b/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	Fri Sep 13 07:57:13 2013 +0200
@@ -33,8 +33,8 @@
 
 void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) {
   if (has_count_table()) {
-    check_card_num(from_card_num,
-                   err_msg("from card num out of range: "SIZE_FORMAT, from_card_num));
+    assert(from_card_num >= 0 && from_card_num < _committed_max_card_num,
+           err_msg("from card num out of range: "SIZE_FORMAT, from_card_num));
     assert(from_card_num < to_card_num,
            err_msg("Wrong order? from: " SIZE_FORMAT ", to: "SIZE_FORMAT,
                    from_card_num, to_card_num));
diff -r 8c5e6482cbfc -r 9cb63cd234a0 src/share/vm/gc_implementation/g1/g1CardCounts.hpp
--- a/src/share/vm/gc_implementation/g1/g1CardCounts.hpp	Fri Sep 13 22:25:27 2013 +0200
+++ b/src/share/vm/gc_implementation/g1/g1CardCounts.hpp	Fri Sep 13 07:57:13 2013 +0200
@@ -72,25 +72,21 @@
     return has_reserved_count_table() && _committed_max_card_num > 0;
   }
 
-  void check_card_num(size_t card_num, const char* msg) {
-    assert(card_num >= 0 && card_num < _committed_max_card_num, msg);
-  }
-
   size_t ptr_2_card_num(const jbyte* card_ptr) {
     assert(card_ptr >= _ct_bot,
-           err_msg("Inavalied card pointer: "
+           err_msg("Invalid card pointer: "
                    "card_ptr: " PTR_FORMAT ", "
                    "_ct_bot: " PTR_FORMAT,
                    card_ptr, _ct_bot));
     size_t card_num = pointer_delta(card_ptr, _ct_bot, sizeof(jbyte));
-    check_card_num(card_num,
-                   err_msg("card pointer out of range: " PTR_FORMAT, card_ptr));
+    assert(card_num >= 0 && card_num < _committed_max_card_num,
+           err_msg("card pointer out of range: " PTR_FORMAT, card_ptr));
     return card_num;
   }
 
   jbyte* card_num_2_ptr(size_t card_num) {
-    check_card_num(card_num,
-                   err_msg("card num out of range: "SIZE_FORMAT, card_num));
+    assert(card_num >= 0 && card_num < _committed_max_card_num,
+           err_msg("card num out of range: "SIZE_FORMAT, card_num));
     return (jbyte*) (_ct_bot + card_num);
   }