stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8024671: G1 generates assert error messages in product builds

Browse Source 
Reviewed-by: brutisso, tschatzl
This commit is contained in:
Aleksey Shipilev 2013-09-13 07:57:13 +02:00
parent 4d3c6221b7
commit 403a37663a
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
View File

@ -33,8 +33,8 @@
void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) { void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) {
if (has_count_table()) { if (has_count_table()) {
check_card_num(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)); err_msg("from card num out of range: "SIZE_FORMAT, from_card_num));
assert(from_card_num < to_card_num, assert(from_card_num < to_card_num,
err_msg("Wrong order? from: " SIZE_FORMAT ", to: "SIZE_FORMAT, err_msg("Wrong order? from: " SIZE_FORMAT ", to: "SIZE_FORMAT,
from_card_num, to_card_num)); from_card_num, to_card_num));

14
hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
View File

@ -72,25 +72,21 @@ class G1CardCounts: public CHeapObj<mtGC> {
return has_reserved_count_table() && _committed_max_card_num > 0; 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) { size_t ptr_2_card_num(const jbyte* card_ptr) {
assert(card_ptr >= _ct_bot, assert(card_ptr >= _ct_bot,
err_msg("Inavalied card pointer: " err_msg("Invalid card pointer: "
"card_ptr: " PTR_FORMAT ", " "card_ptr: " PTR_FORMAT ", "
"_ct_bot: " PTR_FORMAT, "_ct_bot: " PTR_FORMAT,
card_ptr, _ct_bot)); card_ptr, _ct_bot));
size_t card_num = pointer_delta(card_ptr, _ct_bot, sizeof(jbyte)); size_t card_num = pointer_delta(card_ptr, _ct_bot, sizeof(jbyte));
check_card_num(card_num, assert(card_num >= 0 && card_num < _committed_max_card_num,
err_msg("card pointer out of range: " PTR_FORMAT, card_ptr)); err_msg("card pointer out of range: " PTR_FORMAT, card_ptr));
return card_num; return card_num;
} }
jbyte* card_num_2_ptr(size_t card_num) { jbyte* card_num_2_ptr(size_t card_num) {
check_card_num(card_num, assert(card_num >= 0 && card_num < _committed_max_card_num,
err_msg("card num out of range: "SIZE_FORMAT, card_num)); err_msg("card num out of range: "SIZE_FORMAT, card_num));
return (jbyte*) (_ct_bot + card_num); return (jbyte*) (_ct_bot + card_num);
} }