For starvation check openjdk#5

Author: DougLea

src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java

@@ -1291,8 +1291,7 @@ final void push(ForkJoinTask<?> task, ForkJoinPool pool,
                     unlockPhase();
                 if (room < 0)
                     throw new RejectedExecutionException("Queue capacity exceeded");
-                else if ((room == 0 || s == base || a[m & (s - 1)] == null) &&
-                         pool != null)
+                else if ((room == 0 || a[m & (s - 1)] == null) && pool != null)
                     pool.signalWork(); // may have appeared empty
             }
         }
@@ -1991,7 +1990,7 @@ final void runWorker(WorkQueue w) {
                     if ((q = qs[j = i & (n - 1)]) != null &&
                         (a = q.array) != null && (cap = a.length) > 0) {
                         for (int m = cap - 1, pb = -1;;) { // track progress
-                            ForkJoinTask<?> t; int b; long k;
+                            ForkJoinTask<?> t; int b, nb; long k;
                             t = (ForkJoinTask<?>)U.getReferenceAcquire(
                                 a, k = slotOffset(m & (b = q.base)));
                             if (q.base != b)              // inconsistent
@@ -2010,13 +2009,15 @@ else if (t == null) {
                                 }
                             }
                             else if (U.compareAndSetReference(a, k, t, null)) {
-                                ForkJoinTask<?> next = a[(q.base = b + 1) & m];
+                                ForkJoinTask<?> next = a[(nb = q.base = b + 1) & m];
                                 w.nsteals = ++nsteals;
                                 w.source = j;             // volatile
                                 rescan = true;
-                                if (next != null &&
-                                    (!propagated || t.getClass().getSuperclass() ==
-                                     interruptibleTaskClass)) {
+                                if ((t.getClass().getSuperclass() ==
+                                     interruptibleTaskClass) ?
+                                    (next != null ||
+                                     (j & 1) == 0 && q.top - nb > 0) :
+                                    (!propagated && next != null)) {
                                     propagated = true;
                                     signalWork();
                                 }