--- old/src/hotspot/share/runtime/deoptimization.cpp	2019-09-12 13:13:08.174918986 +0200
+++ new/src/hotspot/share/runtime/deoptimization.cpp	2019-09-12 13:13:07.884908886 +0200
@@ -298,6 +298,7 @@
   if (jvmci_enabled || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateAllocations)) {
     realloc_failures = eliminate_allocations(thread, exec_mode, cm, deoptee, map, chunk);
   }
+#endif // COMPILER2_OR_JVMCI
 
   // Revoke biases, done with in java state.
   // No safepoints allowed after this
@@ -309,6 +310,7 @@
   // Locks may be rebaised in a safepoint.
   NoSafepointVerifier no_safepoint;
 
+#if COMPILER2_OR_JVMCI
   if (jvmci_enabled || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateLocks)) {
     eliminate_locks(thread, chunk, realloc_failures);
   }
@@ -1473,7 +1475,7 @@
   int len = objects_to_revoke->length();
   for (int i = 0; i < len; i++) {
     oop obj = (objects_to_revoke->at(i))();
-    BiasedLocking::revoke_own_locks(objects_to_revoke->at(i), thread);
+    BiasedLocking::revoke_own_lock(objects_to_revoke->at(i), thread);
     assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now");
   }
 }