1.1 --- a/src/share/vm/compiler/compileBroker.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/compiler/compileBroker.cpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -206,7 +206,7 @@
1.11 void log_nmethod(JavaThread* thread, nmethod* nm) {
1.12 log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]",
1.13 nm->compile_id(), nm->is_osr_method() ? "%" : "",
1.14 - nm, nm->code_begin(), nm->code_end());
1.15 + p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end()));
1.16 }
1.17
1.18 void log_failure(JavaThread* thread, CompileTask* task, const char* reason, const char* retry_message) {
1.19 @@ -1791,7 +1791,7 @@
1.20 if (xtty != NULL) {
1.21 ttyLocker ttyl;
1.22 // Record any per thread log files
1.23 - xtty->elem("thread_logfile thread='%d' filename='%s'", thread_id, file_name);
1.24 + xtty->elem("thread_logfile thread='" INTX_FORMAT "' filename='%s'", thread_id, file_name);
1.25 }
1.26 return;
1.27 }
1.28 @@ -1822,7 +1822,7 @@
1.29 if (_should_block) {
1.30 #ifndef PRODUCT
1.31 if (PrintCompilation && (Verbose || WizardMode))
1.32 - tty->print_cr("compiler thread " INTPTR_FORMAT " poll detects block request", Thread::current());
1.33 + tty->print_cr("compiler thread " INTPTR_FORMAT " poll detects block request", p2i(Thread::current()));
1.34 #endif
1.35 ThreadInVMfromNative tivfn(JavaThread::current());
1.36 }
1.37 @@ -1839,7 +1839,7 @@
1.38 CodeCache::print_summary(&s, detailed);
1.39 }
1.40 ttyLocker ttyl;
1.41 - tty->print(s.as_string());
1.42 + tty->print("%s", s.as_string());
1.43 }
1.44
1.45 // ------------------------------------------------------------------
1.46 @@ -2044,7 +2044,7 @@
1.47 // Lock to prevent tearing
1.48 ttyLocker ttyl;
1.49 xtty->begin_elem("code_cache_full");
1.50 - xtty->print(s.as_string());
1.51 + xtty->print("%s", s.as_string());
1.52 xtty->stamp();
1.53 xtty->end_elem();
1.54 }
