1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Tue Feb 23 18:58:36 2016 -0500
1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Thu Jun 14 09:15:08 2018 -0700
1.3 @@ -196,8 +196,8 @@
1.4 assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \
1.5 "outside underlying space?"); \
1.6 assert(G1CollectedHeap::heap()->is_in_exact(addr), \
1.7 - err_msg("Trying to access not available bitmap "PTR_FORMAT \
1.8 - " corresponding to "PTR_FORMAT" (%u)", \
1.9 + err_msg("Trying to access not available bitmap " PTR_FORMAT \
1.10 + " corresponding to " PTR_FORMAT " (%u)", \
1.11 p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr)));
1.12
1.13 inline void CMBitMap::mark(HeapWord* addr) {
1.14 @@ -343,7 +343,7 @@
1.15
1.16 inline void CMTask::deal_with_reference(oop obj) {
1.17 if (_cm->verbose_high()) {
1.18 - gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT,
1.19 + gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT,
1.20 _worker_id, p2i((void*) obj));
1.21 }
1.22
1.23 @@ -392,7 +392,7 @@
1.24 // assert that word_size is under an upper bound which is its
1.25 // containing region's capacity.
1.26 assert(word_size * HeapWordSize <= hr->capacity(),
1.27 - err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT,
1.28 + err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT,
1.29 word_size * HeapWordSize, hr->capacity(),
1.30 HR_FORMAT_PARAMS(hr)));
1.31
