Recursively interpolate bounds in interpolateWildcards

odersky · odersky · commit 4800aec152cc · 2019-10-09T16:37:57.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -834,9 +834,9 @@ class Typer extends Namer
       case _ => untpd.TypeTree(tp)
     }
     def interpolateWildcards = new TypeMap {
-      def apply(t: Type) = t match
-        case WildcardType => newTypeVar(TypeBounds.empty)
-        case WildcardType(bounds: TypeBounds) => newTypeVar(bounds)
+      def apply(t: Type): Type = t match
+        case WildcardType(bounds: TypeBounds) =>
+          newTypeVar(apply(bounds.orElse(TypeBounds.empty)).bounds)
         case _ => mapOver(t)
     }
     pt.stripTypeVar.dealias match {

Original file line number	Diff line number	Diff line change
`@@ -834,9 +834,9 @@ class Typer extends Namer`
`834`	`834`	`case _ => untpd.TypeTree(tp)`
`835`	`835`	`}`
`836`	`836`	`def interpolateWildcards = new TypeMap {`
`837`		`- def apply(t: Type) = t match`
`838`		`- case WildcardType => newTypeVar(TypeBounds.empty)`
`839`		`- case WildcardType(bounds: TypeBounds) => newTypeVar(bounds)`
	`837`	`+ def apply(t: Type): Type = t match`
	`838`	`+ case WildcardType(bounds: TypeBounds) =>`
	`839`	`+ newTypeVar(apply(bounds.orElse(TypeBounds.empty)).bounds)`
`840`	`840`	`case _ => mapOver(t)`
`841`	`841`	`}`
`842`	`842`	`pt.stripTypeVar.dealias match {`