1 files changed, 9 insertions, 15 deletions
diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf
index 0770b3cb95..637bd586e0 100644
--- a/bincompat-backward.whitelist.conf
+++ b/bincompat-backward.whitelist.conf
@@ -186,6 +186,15 @@ filter {
         matchName="scala.reflect.runtime.SynchronizedOps.newNestedScope"
         problemName=MissingMethodProblem
     },
+    // see github.com/scala/scala/pull/3925, SI-8627, SI-6440
+    {
+        matchName="scala.collection.TraversableLike.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.immutable.Stream.filteredTail"
+        problemName=MissingMethodProblem
+    },
     // https://github.com/scala/scala/pull/3848 -- SI-8680
     {
         matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$6"
@@ -208,21 +217,6 @@ filter {
     {
         matchName="scala.reflect.io.ZipArchive.scala$reflect$io$ZipArchive$$walkIterator"
         problemName=MissingMethodProblem
-    },
-    // SI-8362: AbstractPromise extends AtomicReference
-    // It's ok to change a package-protected class in an impl package,
-    // even though it's not clear why it changed -- bug in generic signature generation?
-    // -public class scala.concurrent.impl.Promise$DefaultPromise<T>                          extends scala.concurrent.impl.AbstractPromise implements scala.concurrent.impl.Promise<T>
-    // +public class scala.concurrent.impl.Promise$DefaultPromise<T extends java.lang.Object> extends scala.concurrent.impl.AbstractPromise implements scala.concurrent.impl.Promise<T>
-    {
-        matchName="scala.concurrent.impl.Promise$DefaultPromise"
-        problemName=MissingTypesProblem
-    },
-    // SI-9488: Due to SI-8362 above, toString was silently changed to the AtomicReference toString implementation,
-    // This is fixed by SI-9488, and this should be safe since the class in question is stdlib internal.
-    {
-        matchName="scala.concurrent.impl.Promise.toString"
-        problemName=MissingMethodProblem
     }
   ]
 }