src/hotspot/share/runtime/deoptimization.cpp

rev 54936 : [mq]: 8221734-v3
rev 54937 : [mq]: 8221734-v5

@@ -1292,11 +1292,11 @@
     cvf = compiledVFrame::cast(cvf->sender());
   }
   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;
   }
   GrowableArray<Handle>* objects_to_revoke = new GrowableArray<Handle>();
   get_monitors_from_stack(objects_to_revoke, thread, fr, map);

@@ -1306,21 +1306,20 @@
   } else {
     BiasedLocking::revoke(objects_to_revoke);
   }
 }
 
-void Deoptimization::revoke_handshake(JavaThread* thread, frame fr, RegisterMap* map) {
+void Deoptimization::revoke_using_handshake(JavaThread* thread, frame fr, RegisterMap* map) {
   if (!UseBiasedLocking) {
     return;
   }
   GrowableArray<Handle>* objects_to_revoke = new GrowableArray<Handle>();
   get_monitors_from_stack(objects_to_revoke, thread, fr, map);
 
   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");
   }
 }
 

@@ -1370,13 +1369,13 @@
   }
   ResourceMark rm;
   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);
 
 }