From 77437ffa521a6d1b073283624a722848a8c0b33c Mon Sep 17 00:00:00 2001
From: Philipp Haller <hallerp@gmail.com>
Date: Sat, 11 May 2013 14:30:08 +0200
Subject: SI-7442 Update bundled Fork/Join pool (JSR166y)

- Updates ForkJoinPool and dependent classes to the latest jsr166y revisions:

    ForkJoinPool.java:
    Revision 1.185
    Sat Feb 16 20:50:29 2013 UTC (2 months, 2 weeks ago) by jsr166

    ForkJoinTask.java:
    Revision 1.100
    Tue Feb 5 17:09:54 2013 UTC (3 months ago) by jsr166

    ForkJoinWorkerThread.java:
    Revision 1.73
    Wed Nov 21 19:54:39 2012 UTC (5 months, 2 weeks ago) by dl

- Includes Akka-contributed `sun.misc.Unsafe` detection to support Android.
  See changeset 06d685c1bbd8a0d058ee8a3f374569f8097f2acc

- Adds private `CountedCompleter` class.
  This class is only visible and used in `ForkJoinPool.java`.

- Updates desired.sha1 for updated forkjoin.jar.

- Updates binary compatibility whitelists to exclude package-private methods
  in the `forkjoin` package.

- Also fixes SI-7438.
---
 bincompat-backward.whitelist.conf | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'bincompat-backward.whitelist.conf')

diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf
index 3426dc72e1..904e9477a2 100644
--- a/bincompat-backward.whitelist.conf
+++ b/bincompat-backward.whitelist.conf
@@ -190,6 +190,35 @@ filter {
         {
             matchName="scala.reflect.internal.Types#TypeVar.setInst"
             problemName=IncompatibleResultTypeProblem
+        },
+        # scala.concurrent.forkjoin (SI-7442)
+        {
+            matchName="scala.concurrent.forkjoin.ForkJoinTask.internalGetCompleter"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.concurrent.forkjoin.ForkJoinPool.registerWorker"
+            problemName=IncompatibleMethTypeProblem
+        },
+        {
+            matchName="scala.concurrent.forkjoin.ForkJoinPool.nextWorkerName"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.concurrent.forkjoin.ForkJoinPool.signalWork"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.concurrent.forkjoin.ForkJoinPool.idlePerActive"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.concurrent.forkjoin.ForkJoinPool.tryCompensate"
+            problemName=MissingMethodProblem
+        },
+        {
+            matchName="scala.concurrent.forkjoin.ForkJoinPool.helpJoinOnce"
+            problemName=IncompatibleResultTypeProblem
         }
     ]
 }
-- 
cgit v1.2.3