Address reviewer comments.

Author: peter-hofer

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitor.java

@@ -167,6 +167,7 @@ boolean tryLock() {
             if (r < 0) { // overflow
                 throw new Error("Maximum lock count exceeded");
             }
+            // Note: protected by monitor and not required to be observable, no ordering needed
             acquisitions = r;
             return true;
         }
@@ -187,6 +188,7 @@ protected boolean tryRelease(long releases) {
             acquisitions = 1;
             setState(0);
         } else {
+            // Note: protected by monitor and not required to be observable, no ordering needed
             assert releases < acquisitions;
             acquisitions -= (int) releases;
         }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitorQueuedSynchronizer.java

@@ -153,10 +153,11 @@ protected final void setState(long newState) {
      * For {@linkplain JavaMonitorConditionObject#await conditional waiting}, returns the number of
      * acquisitions, which is subsequently passed to {@link #tryRelease} to entirely release
      * ownership, and later to {@link #tryAcquire} to regain ownership after waiting.
+     *
+     * While {@code AbstractQueuedLongSynchronizer} calls {@link #getState()} assuming that it
+     * encodes the acquisition count, this method allows for more flexibility in implementations.
      */
-    protected long getAcquisitions() {
-        return getState();
-    }
+    protected abstract long getAcquisitions();
 
     // see AbstractQueuedLongSynchronizer.compareAndSetState(long, long)
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
@@ -341,7 +342,7 @@ private int cancelAcquire(Node node) {
     protected abstract boolean tryAcquire(long arg);
 
     // see AbstractQueuedLongSynchronizer.tryRelease(long)
-    protected abstract boolean tryRelease(long releases);
+    protected abstract boolean tryRelease(long arg);
 
     // see AbstractQueuedLongSynchronizer.isHeldExclusively()
     protected abstract boolean isHeldExclusively();