1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Tue Feb 23 18:58:36 2016 -0500
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Thu Jun 14 09:15:08 2018 -0700
1.3 @@ -381,7 +381,7 @@
1.4
1.5 void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
1.6 guarantee((size_t)start_idx + new_num_regions <= max_uintx,
1.7 - err_msg("Trying to invalidate beyond maximum region, from %u size "SIZE_FORMAT,
1.8 + err_msg("Trying to invalidate beyond maximum region, from %u size " SIZE_FORMAT,
1.9 start_idx, new_num_regions));
1.10 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
1.11 uint end_idx = (start_idx + (uint)new_num_regions);
1.12 @@ -650,13 +650,13 @@
1.13
1.14 assert(_coarse_map.size() == region_bm->size(), "Precondition");
1.15 if (G1RSScrubVerbose) {
1.16 - gclog_or_tty->print(" Coarse map: before = "SIZE_FORMAT"...",
1.17 + gclog_or_tty->print(" Coarse map: before = " SIZE_FORMAT "...",
1.18 _n_coarse_entries);
1.19 }
1.20 _coarse_map.set_intersection(*region_bm);
1.21 _n_coarse_entries = _coarse_map.count_one_bits();
1.22 if (G1RSScrubVerbose) {
1.23 - gclog_or_tty->print_cr(" after = "SIZE_FORMAT".", _n_coarse_entries);
1.24 + gclog_or_tty->print_cr(" after = " SIZE_FORMAT ".", _n_coarse_entries);
1.25 }
1.26
1.27 // Now do the fine-grained maps.
1.28 @@ -1052,7 +1052,7 @@
1.29
1.30 card_index = _cur_region_card_offset + _cur_card_in_prt;
1.31 guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion,
1.32 - err_msg("Card index "SIZE_FORMAT" must be within the region", _cur_card_in_prt));
1.33 + err_msg("Card index " SIZE_FORMAT " must be within the region", _cur_card_in_prt));
1.34 return true;
1.35 }
1.36
1.37 @@ -1221,8 +1221,8 @@
1.38
1.39 size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize;
1.40 assert(dummy->mem_size() > min_prt_size,
1.41 - err_msg("PerRegionTable memory usage is suspiciously small, only has "SIZE_FORMAT" bytes. "
1.42 - "Should be at least "SIZE_FORMAT" bytes.", dummy->mem_size(), min_prt_size));
1.43 + err_msg("PerRegionTable memory usage is suspiciously small, only has " SIZE_FORMAT " bytes. "
1.44 + "Should be at least " SIZE_FORMAT " bytes.", dummy->mem_size(), min_prt_size));
1.45 free(dummy);
1.46 guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size");
1.47 // try to reset the state
