src/java.base/share/classes/java/lang/ref/ReferenceQueue.java

@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this

@@ -143,23 +143,10 @@
          synchronized (lock) {
              return enqueue0(r);
          }
      }
  
-     private boolean tryDisablePreempt() {
-         if (Thread.currentThread().isVirtual() && ContinuationSupport.isSupported()) {
-             Continuation.pin();
-             return true;
-         } else {
-             return false;
-         }
-     }
- 
-     private void enablePreempt() {
-         Continuation.unpin();
-     }
- 
      /**
       * Polls this queue to see if a reference object is available.  If one is
       * available without further delay then it is removed from the queue and
       * returned.  Otherwise this method immediately returns {@code null}.
       *

@@ -171,17 +158,17 @@
          if (head == null)
              return null;
  
          // Prevent a virtual thread from being preempted as this could potentially
          // deadlock with a carrier that is polling the same reference queue.
-         boolean disabled = tryDisablePreempt();
+         boolean pinned = Thread.currentThread().isVirtual() && ContinuationSupport.pinIfSupported();
          try {
              synchronized (lock) {
                  return poll0();
              }
          } finally {
-             if (disabled) enablePreempt();
+             if (pinned) Continuation.unpin();
          }
      }
  
      /**
       * Removes the next reference object in this queue, blocking until either