archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 06:14:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6921352: JSR 292 needs its own deopt handler

Browse source 
We need to introduce a new MH deopt handler so we can easily determine if the deopt happened at a MH call site or not.

Reviewed-by: never, jrose
This commit is contained in:
Christian Thalinger 2010-02-01 19:29:46 +01:00
parent 8cc63249e9
commit 918c7a2e33
15 changed files with 253 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hotspot/src/share/vm/runtime/sharedRuntime.cpp
View file

@ -1033,10 +1033,20 @@ JRT_BLOCK_ENTRY(address, SharedRuntime::handle_wrong_method(JavaThread* thread))
address sender_pc = caller_frame.pc();
CodeBlob* sender_cb = caller_frame.cb();
nmethod* sender_nm = sender_cb->as_nmethod_or_null();
bool is_mh_invoke_via_adapter = false; // Direct c2c call or via adapter?
if (sender_nm != NULL && sender_nm->is_method_handle_return(sender_pc)) {
// If the callee_target is set, then we have come here via an i2c
// adapter.
methodOop callee = thread->callee_target();
if (callee != NULL) {
assert(callee->is_method(), "sanity");
is_mh_invoke_via_adapter = true;
}
}
if (caller_frame.is_interpreted_frame() ||
caller_frame.is_entry_frame() ||
(sender_nm != NULL && sender_nm->is_method_handle_return(sender_pc))) {
caller_frame.is_entry_frame() ||
is_mh_invoke_via_adapter) {
methodOop callee = thread->callee_target();
guarantee(callee != NULL && callee->is_method(), "bad handshake");
thread->set_vm_result(callee);
@ -1417,7 +1427,7 @@ IRT_LEAF(void, SharedRuntime::fixup_callers_callsite(methodOopDesc* method, addr
if (callee == cb || callee->is_adapter_blob()) {
// static call or optimized virtual
if (TraceCallFixup) {
tty->print("fixup callsite at " INTPTR_FORMAT " to compiled code for", caller_pc);
tty->print("fixup callsite at " INTPTR_FORMAT " to compiled code for", caller_pc);
moop->print_short_name(tty);
tty->print_cr(" to " INTPTR_FORMAT, entry_point);
}
@ -1433,7 +1443,7 @@ IRT_LEAF(void, SharedRuntime::fixup_callers_callsite(methodOopDesc* method, addr
}
} else {
if (TraceCallFixup) {
tty->print("already patched callsite at " INTPTR_FORMAT " to compiled code for", caller_pc);
tty->print("already patched callsite at " INTPTR_FORMAT " to compiled code for", caller_pc);
moop->print_short_name(tty);
tty->print_cr(" to " INTPTR_FORMAT, entry_point);
}