1.1 --- a/src/share/vm/gc_implementation/g1/g1CardCounts.hpp Fri Sep 13 22:25:27 2013 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CardCounts.hpp Fri Sep 13 07:57:13 2013 +0200
1.3 @@ -72,25 +72,21 @@
1.4 return has_reserved_count_table() && _committed_max_card_num > 0;
1.5 }
1.6
1.7 - void check_card_num(size_t card_num, const char* msg) {
1.8 - assert(card_num >= 0 && card_num < _committed_max_card_num, msg);
1.9 - }
1.10 -
1.11 size_t ptr_2_card_num(const jbyte* card_ptr) {
1.12 assert(card_ptr >= _ct_bot,
1.13 - err_msg("Inavalied card pointer: "
1.14 + err_msg("Invalid card pointer: "
1.15 "card_ptr: " PTR_FORMAT ", "
1.16 "_ct_bot: " PTR_FORMAT,
1.17 card_ptr, _ct_bot));
1.18 size_t card_num = pointer_delta(card_ptr, _ct_bot, sizeof(jbyte));
1.19 - check_card_num(card_num,
1.20 - err_msg("card pointer out of range: " PTR_FORMAT, card_ptr));
1.21 + assert(card_num >= 0 && card_num < _committed_max_card_num,
1.22 + err_msg("card pointer out of range: " PTR_FORMAT, card_ptr));
1.23 return card_num;
1.24 }
1.25
1.26 jbyte* card_num_2_ptr(size_t card_num) {
1.27 - check_card_num(card_num,
1.28 - err_msg("card num out of range: "SIZE_FORMAT, card_num));
1.29 + assert(card_num >= 0 && card_num < _committed_max_card_num,
1.30 + err_msg("card num out of range: "SIZE_FORMAT, card_num));
1.31 return (jbyte*) (_ct_bot + card_num);
1.32 }
1.33
