archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 01:54:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8263721: Unify oop casting

Browse source 
Reviewed-by: kbarrett, coleenp
This commit is contained in:
Stefan Karlsson 2021-03-24 10:28:38 +00:00
parent 329697b02e
commit a79f095697
90 changed files with 248 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -271,7 +271,7 @@ static void restore_eliminated_locks(JavaThread* thread, GrowableArray<compiledV
}
if (exec_mode == Deoptimization::Unpack_none) {
ObjectMonitor* monitor = deoptee_thread->current_waiting_monitor();
if (monitor != NULL && (oop)monitor->object() == mi->owner()) {
if (monitor != NULL && monitor->object() == mi->owner()) {
tty->print_cr(" object <" INTPTR_FORMAT "> DEFERRED relocking after wait", p2i(mi->owner()));
continue;
}
@ -1467,7 +1467,7 @@ bool Deoptimization::relock_objects(JavaThread* thread, GrowableArray<MonitorInf
if (mark.has_monitor()) {
// defer relocking if the deoptee thread is currently waiting for obj
ObjectMonitor* waiting_monitor = deoptee_thread->current_waiting_monitor();
if (waiting_monitor != NULL && (oop)waiting_monitor->object() == obj()) {
if (waiting_monitor != NULL && waiting_monitor->object() == obj()) {
assert(fr.is_deoptimized_frame(), "frame must be scheduled for deoptimization");
mon_info->lock()->set_displaced_header(markWord::unused_mark());
JvmtiDeferredUpdates::inc_relock_count_after_wait(deoptee_thread);