8225019: Update JVMCI

Reviewed-by: never, dlong
This commit is contained in:
Vladimir Kozlov 2019-06-04 12:44:53 -07:00
parent 766a7dd9f7
commit 7356905a83
83 changed files with 609 additions and 210 deletions

View file

@ -2076,7 +2076,7 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* thread, jint tra
if (trap_method() == nm->method()) {
make_not_compilable = true;
} else {
trap_method->set_not_compilable(CompLevel_full_optimization, true, "overflow_recompile_count > PerBytecodeRecompilationCutoff");
trap_method->set_not_compilable("overflow_recompile_count > PerBytecodeRecompilationCutoff", CompLevel_full_optimization);
// But give grace to the enclosing nm->method().
}
}
@ -2090,7 +2090,7 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* thread, jint tra
// Give up compiling
if (make_not_compilable && !nm->method()->is_not_compilable(CompLevel_full_optimization)) {
assert(make_not_entrant, "consistent");
nm->method()->set_not_compilable(CompLevel_full_optimization);
nm->method()->set_not_compilable("give up compiling", CompLevel_full_optimization);
}
} // Free marked resources