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

8205824: Update Graal

Browse source 
Reviewed-by: iveresov, kvn
This commit is contained in:
Tom Rodriguez 2018-06-27 17:02:41 -07:00
parent 80e93fc752
commit 6fc0ec871a
2690 changed files with 7142 additions and 1208 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/hotspot/share/runtime/deoptimization.cpp
View file

@ -1547,13 +1547,13 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* thread, jint tra
methodHandle trap_method = trap_scope->method();
int trap_bci = trap_scope->bci();
#if INCLUDE_JVMCI
oop speculation = thread->pending_failed_speculation();
long speculation = thread->pending_failed_speculation();
if (nm->is_compiled_by_jvmci()) {
if (speculation != NULL) {
if (speculation != 0) {
oop speculation_log = nm->as_nmethod()->speculation_log();
if (speculation_log != NULL) {
if (TraceDeoptimization || TraceUncollectedSpeculations) {
if (HotSpotSpeculationLog::lastFailed(speculation_log) != NULL) {
if (HotSpotSpeculationLog::lastFailed(speculation_log) != 0) {
tty->print_cr("A speculation that was not collected by the compiler is being overwritten");
}
}
@ -1566,14 +1566,14 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* thread, jint tra
tty->print_cr("Speculation present but no speculation log");
}
}
thread->set_pending_failed_speculation(NULL);
thread->set_pending_failed_speculation(0);
} else {
if (TraceDeoptimization) {
tty->print_cr("No speculation");
}
}
} else {
assert(speculation == NULL, "There should not be a speculation for method compiled by non-JVMCI compilers");
assert(speculation == 0, "There should not be a speculation for method compiled by non-JVMCI compilers");
}
if (trap_bci == SynchronizationEntryBCI) {