--- old/src/hotspot/share/runtime/deoptimization.cpp 2019-05-21 12:00:06.124582547 +0200 +++ new/src/hotspot/share/runtime/deoptimization.cpp 2019-05-21 12:00:05.651566449 +0200 @@ -1294,7 +1294,7 @@ collect_monitors(cvf, objects_to_revoke); } -void Deoptimization::revoke_safepoint(JavaThread* thread, frame fr, RegisterMap* map) { +void Deoptimization::revoke_using_safepoint(JavaThread* thread, frame fr, RegisterMap* map) { if (!UseBiasedLocking) { return; } @@ -1308,7 +1308,7 @@ } } -void Deoptimization::revoke_handshake(JavaThread* thread, frame fr, RegisterMap* map) { +void Deoptimization::revoke_using_handshake(JavaThread* thread, frame fr, RegisterMap* map) { if (!UseBiasedLocking) { return; } @@ -1318,7 +1318,6 @@ int len = objects_to_revoke->length(); for (int i = 0; i < len; i++) { oop obj = (objects_to_revoke->at(i))(); - markOop mark = obj->mark(); BiasedLocking::revoke_own_locks_in_handshake(objects_to_revoke->at(i), thread); assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now"); } @@ -1372,9 +1371,9 @@ DeoptimizationMarker dm; if (UseBiasedLocking) { if (in_handshake) { - revoke_handshake(thread, fr, map); + revoke_using_handshake(thread, fr, map); } else { - revoke_safepoint(thread, fr, map); + revoke_using_safepoint(thread, fr, map); } } deoptimize_single_frame(thread, fr, reason);