--- old/src/hotspot/cpu/aarch64/aarch64.ad	2019-08-27 15:54:03.996461688 +0000
+++ new/src/hotspot/cpu/aarch64/aarch64.ad	2019-08-27 15:54:02.659430491 +0000
@@ -3569,7 +3569,7 @@
     // Store a non-null value into the box to avoid looking like a re-entrant
     // lock. The fast-path monitor unlock code checks for
     // markWord::monitor_value so use markWord::unused_mark which has the
-    // relevant bit set, and also matches ObjectSynchronizer::slow_enter.
+    // relevant bit set, and also matches ObjectSynchronizer::enter.
     __ mov(tmp, (address)markWord::unused_mark().value());
     __ str(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
 
--- old/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp	2019-08-27 15:54:05.792503594 +0000
+++ new/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp	2019-08-27 15:54:04.353470017 +0000
@@ -2607,8 +2607,8 @@
 // -   Successful Stack-lock: box->dhw == mark.
 //     box->dhw must contain the displaced mark word value
 // -   Failure -- icc.ZFlag == 0 and box->dhw is undefined.
-//     The slow-path fast_enter() and slow_enter() operators
-//     are responsible for setting box->dhw = NonZero (typically markWord::unused_mark()).
+//     The slow-path enter() is responsible for setting
+//     box->dhw = NonZero (typically markWord::unused_mark()).
 // -   Biased: box->dhw is undefined
 //
 // SPARC refworkload performance - specifically jetstream and scimark - are
--- old/src/hotspot/cpu/x86/macroAssembler_x86.cpp	2019-08-27 15:54:07.226537053 +0000
+++ new/src/hotspot/cpu/x86/macroAssembler_x86.cpp	2019-08-27 15:54:05.974507840 +0000
@@ -1620,8 +1620,8 @@
 // See also: cmpFastLock and cmpFastUnlock.
 //
 // What follows is a specialized inline transliteration of the code
-// in slow_enter() and slow_exit().  If we're concerned about I$ bloat
-// another option would be to emit TrySlowEnter and TrySlowExit methods
+// in enter() and exit(). If we're concerned about I$ bloat another
+// option would be to emit TrySlowEnter and TrySlowExit methods
 // at startup-time.  These methods would accept arguments as
 // (rax,=Obj, rbx=Self, rcx=box, rdx=Scratch) and return success-failure
 // indications in the icc.ZFlag.  Fast_Lock and Fast_Unlock would simply
--- old/src/hotspot/share/runtime/synchronizer.cpp	2019-08-27 15:54:08.757572776 +0000
+++ new/src/hotspot/share/runtime/synchronizer.cpp	2019-08-27 15:54:07.478542933 +0000
@@ -258,9 +258,9 @@
 
 // -----------------------------------------------------------------------------
 // Monitor Enter/Exit
-// The interpreter and compiler use some assembly copies of this code. Make sure
-// update those code if the following function is changed. The implementation
-// is extremely sensitive to race condition. Be careful.
+// The interpreter and compiler assembly code tries to lock using the fast path
+// of this algorithm. Make sure to update that code if the following function is
+// changed. The implementation is extremely sensitive to race condition. Be careful.
 
 void ObjectSynchronizer::enter(Handle obj, BasicLock* lock, TRAPS) {
   if (UseBiasedLocking) {
--- old/src/hotspot/share/runtime/synchronizer.hpp	2019-08-27 15:54:10.748619232 +0000
+++ new/src/hotspot/share/runtime/synchronizer.hpp	2019-08-27 15:54:08.923576650 +0000
@@ -66,8 +66,6 @@
   // deoptimization at monitor exit. Hence, it does not take a Handle argument.
 
   // This is full version of monitor enter and exit.
-  // The interpreter and compiler use  assembly copies of these routines.
-  // Please keep them synchronized.
   static void enter(Handle obj, BasicLock* lock, TRAPS);
   static void exit(oop obj, BasicLock* lock, Thread* THREAD);