Mercurial > hg > truffle
diff src/share/vm/code/nmethod.cpp @ 6266:1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
6984705: JSR 292 method handle creation should not go through JNI
Summary: remove assembly code for JDK 7 chained method handles
Reviewed-by: jrose, twisti, kvn, mhaupt
Contributed-by: John Rose <john.r.rose@oracle.com>, Christian Thalinger <christian.thalinger@oracle.com>, Michael Haupt <michael.haupt@oracle.com>
author | twisti |
---|---|
date | Tue, 24 Jul 2012 10:51:00 -0700 |
parents | 0382d2b469b2 |
children | 957c266d8bc5 da91efe96a93 |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp Mon Jul 23 13:04:59 2012 -0700 +++ b/src/share/vm/code/nmethod.cpp Tue Jul 24 10:51:00 2012 -0700 @@ -945,8 +945,12 @@ void nmethod::print_on(outputStream* st, const char* msg) const { if (st != NULL) { ttyLocker ttyl; - CompileTask::print_compilation(st, this, msg); - if (WizardMode) st->print(" (" INTPTR_FORMAT ")", this); + if (WizardMode) { + CompileTask::print_compilation(st, this, msg, /*short_form:*/ true); + st->print_cr(" (" INTPTR_FORMAT ")", this); + } else { + CompileTask::print_compilation(st, this, msg, /*short_form:*/ false); + } } } @@ -964,7 +968,9 @@ if (printmethod) { print_code(); print_pcs(); - oop_maps()->print(); + if (oop_maps()) { + oop_maps()->print(); + } } if (PrintDebugInfo) { print_scopes();