Mercurial > hg > icedtea8-forest > hotspot
changeset 10174:5792d995ed26 jdk8u192-b01
8204872: [8u] VS2017: more instances of "error C3680: cannot concatenate user-defined string literals with mismatched literal suffix identifiers"
Reviewed-by: dholmes
author | kevinw |
---|---|
date | Wed, 27 Jun 2018 03:04:33 -0700 |
parents | b2fa3e69edc9 |
children | 54337e3f86ec ad057f2e3211 |
files | src/os/windows/vm/os_windows.cpp src/share/vm/gc_implementation/g1/concurrentMark.cpp src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp src/share/vm/memory/threadLocalAllocBuffer.inline.hpp |
diffstat | 4 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/windows/vm/os_windows.cpp Wed Apr 25 12:21:29 2018 -0400 +++ b/src/os/windows/vm/os_windows.cpp Wed Jun 27 03:04:33 2018 -0700 @@ -5776,7 +5776,7 @@ char* result = os::reserve_memory_special(large_allocation_size, os::large_page_size(), NULL, false); if (result == NULL) { if (VerboseInternalVMTests) { - gclog_or_tty->print("Failed to allocate control block with size "SIZE_FORMAT". Skipping remainder of test.", + gclog_or_tty->print("Failed to allocate control block with size " SIZE_FORMAT ". Skipping remainder of test.", large_allocation_size); } } else { @@ -5789,7 +5789,7 @@ char* actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), expected_location, false); if (actual_location == NULL) { if (VerboseInternalVMTests) { - gclog_or_tty->print("Failed to allocate any memory at "PTR_FORMAT" size "SIZE_FORMAT". Skipping remainder of test.", + gclog_or_tty->print("Failed to allocate any memory at " PTR_FORMAT " size " SIZE_FORMAT ". Skipping remainder of test.", expected_location, large_allocation_size); } } else { @@ -5797,7 +5797,7 @@ os::release_memory_special(actual_location, expected_allocation_size); // only now check, after releasing any memory to avoid any leaks. assert(actual_location == expected_location, - err_msg("Failed to allocate memory at requested location "PTR_FORMAT" of size "SIZE_FORMAT", is "PTR_FORMAT" instead", + err_msg("Failed to allocate memory at requested location " PTR_FORMAT " of size " SIZE_FORMAT ", is " PTR_FORMAT " instead", expected_location, expected_allocation_size, actual_location)); } }
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp Wed Apr 25 12:21:29 2018 -0400 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp Wed Jun 27 03:04:33 2018 -0700 @@ -2846,7 +2846,7 @@ } } - _out->print_cr(" "PTR_FORMAT": "PTR_FORMAT"%s%s", + _out->print_cr(" " PTR_FORMAT ": " PTR_FORMAT "%s%s", p2i(p), p2i((void*) obj), str, str2); } }; @@ -2873,7 +2873,7 @@ bool print_it = _all || over_tams || marked; if (print_it) { - _out->print_cr(" "PTR_FORMAT"%s", + _out->print_cr(" " PTR_FORMAT "%s", p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : ""); PrintReachableOopClosure oopCl(_out, _vo, _all); o->oop_iterate_no_header(&oopCl); @@ -2894,7 +2894,7 @@ HeapWord* e = hr->end(); HeapWord* t = hr->top(); HeapWord* p = _g1h->top_at_mark_start(hr, _vo); - _out->print_cr("** ["PTR_FORMAT", "PTR_FORMAT"] top: "PTR_FORMAT" " + _out->print_cr("** [" PTR_FORMAT ", " PTR_FORMAT "] top: " PTR_FORMAT " " "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p)); _out->cr();
--- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Wed Apr 25 12:21:29 2018 -0400 +++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Wed Jun 27 03:04:33 2018 -0700 @@ -396,7 +396,7 @@ void FromCardCache::print(outputStream* out) { for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { for (uint j = 0; j < _max_regions; j++) { - out->print_cr("_from_card_cache["UINT32_FORMAT"]["UINT32_FORMAT"] = "INT32_FORMAT".", + out->print_cr("_from_card_cache[" UINT32_FORMAT "][" UINT32_FORMAT "] = " INT32_FORMAT ".", i, j, at(i, j)); } } @@ -436,7 +436,7 @@ int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift); if (G1TraceHeapRegionRememberedSet) { - gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = "INT32_FORMAT")", + gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = " INT32_FORMAT ")", hr()->bottom(), from_card, FromCardCache::at((uint)tid, cur_hrm_ind)); }
--- a/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp Wed Apr 25 12:21:29 2018 -0400 +++ b/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp Wed Jun 27 03:04:33 2018 -0700 @@ -94,10 +94,10 @@ if (PrintTLAB && Verbose) { Thread* thrd = myThread(); - gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]" - " obj: "SIZE_FORMAT - " free: "SIZE_FORMAT - " waste: "SIZE_FORMAT"\n", + gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]" + " obj: " SIZE_FORMAT + " free: " SIZE_FORMAT + " waste: " SIZE_FORMAT "\n", "slow", p2i(thrd), thrd->osthread()->thread_id(), obj_size, free(), refill_waste_limit()); }