8037816: Fix for 8036122 breaks build with Xcode5/clang

Repaired or selectively disabled offending formats; future-proofed with additional checking

Reviewed-by: kvn, jrose, stefank
This commit is contained in:
David Chase 2014-05-09 16:50:54 -04:00
parent 563feb9091
commit 305ec3bd3f
293 changed files with 1285 additions and 913 deletions

View file

@ -82,6 +82,8 @@
#include "c1/c1_globals.hpp"
#endif
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
// --------------------------------------------------------------------------------------------------
// Implementation of Safepoint begin/end
@ -787,7 +789,7 @@ static void print_me(intptr_t *new_sp, intptr_t *old_sp, bool *was_oops) {
old_sp += incr*32; new_sp += incr*32; was_oops += incr*32;
for( int i2=0; i2<16; i2++ ) {
tty->print("call %c%d |"PTR_FORMAT" ","LI"[i2>>3],i2&7,new_sp); print_ptrs(*old_sp++,*new_sp++,*was_oops++); }
tty->print_cr("");
tty->cr();
}
#endif // SPARC
#endif // PRODUCT
@ -829,7 +831,7 @@ void SafepointSynchronize::print_safepoint_timeout(SafepointTimeoutReason reason
timeout_error_printed = true;
// Print out the thread info which didn't reach the safepoint for debugging
// purposes (useful when there are lots of threads in the debugger).
tty->print_cr("");
tty->cr();
tty->print_cr("# SafepointSynchronize::begin: Timeout detected:");
if (reason == _spinning_timeout) {
tty->print_cr("# SafepointSynchronize::begin: Timed out while spinning to reach a safepoint.");
@ -849,7 +851,7 @@ void SafepointSynchronize::print_safepoint_timeout(SafepointTimeoutReason reason
(reason == _blocking_timeout && !cur_state->has_called_back()))) {
tty->print("# ");
cur_thread->print();
tty->print_cr("");
tty->cr();
}
}
tty->print_cr("# SafepointSynchronize::begin: (End of list)");
@ -1322,7 +1324,7 @@ void SafepointSynchronize::print_stat_on_exit() {
spstat->_time_to_sync > PrintSafepointStatisticsTimeout * MICROUNITS) {
print_statistics();
}
tty->print_cr("");
tty->cr();
// Print out polling page sampling status.
if (!need_to_track_page_armed_status) {