--- old/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	2013-09-12 00:25:11.363972652 +0400
+++ new/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	2013-09-12 00:25:11.259972650 +0400
@@ -33,8 +33,7 @@
 
 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));
+    check_card_num(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));
--- old/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp	2013-09-12 00:25:11.735972661 +0400
+++ new/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp	2013-09-12 00:25:11.627972659 +0400
@@ -72,8 +72,9 @@
     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);
+  void check_card_num(size_t card_num) {
+    assert(card_num >= 0 && card_num < _committed_max_card_num, 
+            err_msg("card num out of range: "SIZE_FORMAT, card_num));
   }
 
   size_t ptr_2_card_num(const jbyte* card_ptr) {
@@ -83,14 +84,12 @@
                    "_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));
+    check_card_num(card_num);
     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));
+    check_card_num(card_num);
     return (jbyte*) (_ct_bot + card_num);
   }