stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Igor Veresov 2014-06-26 12:04:10 -07:00
commit cbd8e24e34
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
View File

@ -280,6 +280,8 @@ address TemplateInterpreterGenerator::generate_result_handler_for(BasicType type
case T_BYTE : __ sign_extend_byte (rax); break; case T_BYTE : __ sign_extend_byte (rax); break;
case T_SHORT : __ sign_extend_short(rax); break; case T_SHORT : __ sign_extend_short(rax); break;
case T_INT : /* nothing to do */ break; case T_INT : /* nothing to do */ break;
case T_LONG : /* nothing to do */ break;
case T_VOID : /* nothing to do */ break;
case T_DOUBLE : case T_DOUBLE :
case T_FLOAT : case T_FLOAT :
{ const Register t = InterpreterRuntime::SignatureHandlerGenerator::temp(); { const Register t = InterpreterRuntime::SignatureHandlerGenerator::temp();

21
hotspot/src/share/vm/runtime/sharedRuntime.cpp
View File

@ -1176,10 +1176,7 @@ methodHandle SharedRuntime::resolve_sub_helper(JavaThread *thread,
(!is_virtual && invoke_code == Bytecodes::_invokedynamic) || (!is_virtual && invoke_code == Bytecodes::_invokedynamic) ||
( is_virtual && invoke_code != Bytecodes::_invokestatic ), "inconsistent bytecode"); ( is_virtual && invoke_code != Bytecodes::_invokestatic ), "inconsistent bytecode");
// We do not patch the call site if the caller nmethod has been made non-entrant. assert(caller_nm->is_alive(), "It should be alive");
if (!caller_nm->is_in_use()) {
return callee_method;
}
#ifndef PRODUCT #ifndef PRODUCT
// tracing/debugging/statistics // tracing/debugging/statistics
@ -1249,13 +1246,11 @@ methodHandle SharedRuntime::resolve_sub_helper(JavaThread *thread,
// Now that we are ready to patch if the Method* was redefined then // Now that we are ready to patch if the Method* was redefined then
// don't update call site and let the caller retry. // don't update call site and let the caller retry.
// Don't update call site if caller nmethod has been made non-entrant
// as it is a waste of time.
// Don't update call site if callee nmethod was unloaded or deoptimized. // Don't update call site if callee nmethod was unloaded or deoptimized.
// Don't update call site if callee nmethod was replaced by an other nmethod // Don't update call site if callee nmethod was replaced by an other nmethod
// which may happen when multiply alive nmethod (tiered compilation) // which may happen when multiply alive nmethod (tiered compilation)
// will be supported. // will be supported.
if (!callee_method->is_old() && caller_nm->is_in_use() && if (!callee_method->is_old() &&
(callee_nm == NULL || callee_nm->is_in_use() && (callee_method->code() == callee_nm))) { (callee_nm == NULL || callee_nm->is_in_use() && (callee_method->code() == callee_nm))) {
#ifdef ASSERT #ifdef ASSERT
// We must not try to patch to jump to an already unloaded method. // We must not try to patch to jump to an already unloaded method.
@ -1454,14 +1449,12 @@ methodHandle SharedRuntime::handle_ic_miss_helper(JavaThread *thread, TRAPS) {
// out of scope. // out of scope.
JvmtiDynamicCodeEventCollector event_collector; JvmtiDynamicCodeEventCollector event_collector;
// Update inline cache to megamorphic. Skip update if caller has been // Update inline cache to megamorphic. Skip update if we are called from interpreted.
// made non-entrant or we are called from interpreted.
{ MutexLocker ml_patch (CompiledIC_lock); { MutexLocker ml_patch (CompiledIC_lock);
RegisterMap reg_map(thread, false); RegisterMap reg_map(thread, false);
frame caller_frame = thread->last_frame().sender(&reg_map); frame caller_frame = thread->last_frame().sender(&reg_map);
CodeBlob* cb = caller_frame.cb(); CodeBlob* cb = caller_frame.cb();
if (cb->is_nmethod() && ((nmethod*)cb)->is_in_use()) { if (cb->is_nmethod()) {
// Not a non-entrant nmethod, so find inline_cache
CompiledIC* inline_cache = CompiledIC_before(((nmethod*)cb), caller_frame.pc()); CompiledIC* inline_cache = CompiledIC_before(((nmethod*)cb), caller_frame.pc());
bool should_be_mono = false; bool should_be_mono = false;
if (inline_cache->is_optimized()) { if (inline_cache->is_optimized()) {
@ -1604,11 +1597,6 @@ methodHandle SharedRuntime::reresolve_call_site(JavaThread *thread, TRAPS) {
// resolve is only done once. // resolve is only done once.
MutexLocker ml(CompiledIC_lock); MutexLocker ml(CompiledIC_lock);
//
// We do not patch the call site if the nmethod has been made non-entrant
// as it is a waste of time
//
if (caller_nm->is_in_use()) {
if (is_static_call) { if (is_static_call) {
CompiledStaticCall* ssc= compiledStaticCall_at(call_addr); CompiledStaticCall* ssc= compiledStaticCall_at(call_addr);
ssc->set_to_clean(); ssc->set_to_clean();
@ -1618,7 +1606,6 @@ methodHandle SharedRuntime::reresolve_call_site(JavaThread *thread, TRAPS) {
inline_cache->set_to_clean(); inline_cache->set_to_clean();
} }
} }
}
} }