Merge pull request #3367 from retronym/backport/3363

[nomaster]  Fix non-deterministic <:< for deeply nested types

1 files changed, 3 insertions, 214 deletions

diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf
index 0500ec10ab..2d3c20370d 100644
--- a/bincompat-backward.whitelist.conf
+++ b/bincompat-backward.whitelist.conf
@@ -1,4 +1,7 @@
 filter {
+    packages = [
+     "scala.reflect.internal"
+    ]
     problems=[
         # Scala library
         {
@@ -61,136 +64,6 @@ filter {
         #     problemName=IncompatibleResultTypeProblem
         # },
 
-
-        # scala.reflect.internal
-        {
-            matchName="scala.reflect.internal.TreeInfo.scala$reflect$internal$TreeInfo$$isVarPatternDeep0$1"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.TreeInfo.typeArguments"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.TreeInfo.applyDepth"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.TreeInfo.firstTypeArg"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.TreeInfo.methPart"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.TreeInfo.firstArgument"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Trees.DefDef"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.ExistentialsAndSkolems.deskolemizeTypeParams"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.SymbolTable.deAlias"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.SymbolTable.deskolemizeTypeParams"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.AnnotationInfos#Annotatable.addThrowsAnnotation"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.StdAttachments#Attachable.setAttachments"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types#TypeVar.scala$reflect$internal$Types$TypeVar$$addBound$1"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.AnnotationCheckers$AnnotationChecker"
-            problemName=IncompatibleTemplateDefProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types.deAlias"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types.inheritsJavaVarArgsMethod"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types.nonTrivialMembers"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types.isJavaVarargsAncestor"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types.nestedMemberType"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types.normalizeAliases"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Trees#ChangeOwnerTraverser.changeOwner"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.StdAttachments.SuppressMacroExpansionAttachment"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.util.Statistics#RelCounter.scala$reflect$internal$util$Statistics$RelCounter$$super$prefix"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Names#NameOps.name"
-            problemName=MissingFieldProblem
-        },
-        {
-            matchName="scala.reflect.internal.ExistentialsAndSkolems.existentialTransform$default$3"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.ExistentialsAndSkolems.existentialTransform"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.ExistentialsAndSkolems.packSymbols"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.ExistentialsAndSkolems.packSymbols$default$3"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.ExistentialsAndSkolems.isRawParameter"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Trees.substituteInfoParamsIntoDefDef"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.ClassfileConstants.xxxunusedxxxx"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types#TypeVar.setInst"
-            problemName=IncompatibleResultTypeProblem
-        },
         # scala.concurrent.forkjoin (SI-7442)
         {
             matchName="scala.concurrent.forkjoin.ForkJoinTask.internalGetCompleter"
@@ -221,96 +94,12 @@ filter {
             problemName=IncompatibleResultTypeProblem
         },
         {
-            matchName="scala.reflect.internal.Definitions#DefinitionsClass.getClassMethods"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Definitions#DefinitionsClass.primitiveGetClassMethods"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.StdAttachments.unsuppressMacroExpansion"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.StdAttachments.suppressMacroExpansion"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.StdAttachments.isMacroExpansionSuppressed"
-            problemName=MissingMethodProblem
-        },
-        {
             matchName="scala.reflect.runtime.JavaUniverse.isInvalidClassName"
             problemName=MissingMethodProblem
         },
         {
             matchName="scala.reflect.runtime.SymbolLoaders.isInvalidClassName"
             problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types.uncheckedBounds"
-            problemName=MissingMethodProblem
-        }
-        {
-            matchName="scala.reflect.internal.Trees.scala$reflect$internal$Trees$$duplicator"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Trees.duplicateAndKeepPositions"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Trees.scala$reflect$internal$Trees$$duplicator"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.SymbolTable.scala$reflect$internal$Trees$$duplicator"
-            problemName=IncompatibleResultTypeProblem
-        },
-        {
-            matchName="scala.reflect.internal.StdNames.compactifyName"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.util.WeakHashSet"
-            problemName=FinalClassProblem
-        },
-        {
-            matchName="scala.reflect.internal.util.WeakReferenceWithEquals"
-            problemName=MissingClassProblem
-        },
-               {
-            matchName="scala.reflect.internal.SymbolTable.scala$reflect$internal$Types$$uniques"
-            problemName=IncompatibleResultTypeProblem
-        },
-        {
-            matchName="scala.reflect.internal.SymbolTable.scala$reflect$internal$Types$$uniques_="
-            problemName=IncompatibleMethTypeProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types.scala$reflect$internal$Types$$uniques"
-            problemName=IncompatibleResultTypeProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types.scala$reflect$internal$Types$$uniques_="
-            problemName=IncompatibleMethTypeProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types.scala$reflect$internal$Types$$uniques"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.Types.scala$reflect$internal$Types$$uniques_="
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.HasFlags.isDeferredOrDefault"
-            problemName=MissingMethodProblem
-        },
-        {
-            matchName="scala.reflect.internal.HasFlags.isDeferredNotDefault"
-            problemName=MissingMethodProblem
         }
     ]
 }