Try one more @RetainedLocalRef annotation in AbstractFuture.

Otherwise, after our call to `future.clearListeners()`, there might be nothing to keep the listeners alive. (And each time we handle and discard the head of the list, there might be nothing to keep the tail of the list alive.) RELNOTES=n/a PiperOrigin-RevId: 733308592
scope-demo · Mar 4, 2025 · 5004483 · 5004483
1 parent 292cc2a
commit 5004483
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java b/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java
@@ -711,7 +711,7 @@ private static void complete(AbstractFuture<?> param, boolean callInterruptTask)
     // Declare a "true" local variable so that the Checker Framework will infer nullness.
     AbstractFuture<?> future = param;
 
-    Listener next = null;
+    @RetainedLocalRef Listener next = null;
     outer:
     while (true) {
       future.releaseWaiters();

diff --git a/guava/src/com/google/common/util/concurrent/AbstractFuture.java b/guava/src/com/google/common/util/concurrent/AbstractFuture.java
@@ -711,7 +711,7 @@ private static void complete(AbstractFuture<?> param, boolean callInterruptTask)
     // Declare a "true" local variable so that the Checker Framework will infer nullness.
     AbstractFuture<?> future = param;
 
-    Listener next = null;
+    @RetainedLocalRef Listener next = null;
     outer:
     while (true) {
       future.releaseWaiters();