Merge pull request #6400 from dotty-staging/fix-contextbounds

Fix #4996: Properly drop context bounds in type lambdas

Author: odersky

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -211,6 +211,19 @@ object desugar {
       case _ =>
         rhs
     }
+
+    def dropContextBounds(tparam: TypeDef): TypeDef = {
+      def dropInRhs(rhs: Tree): Tree = rhs match {
+        case ContextBounds(tbounds, _) =>
+          tbounds
+        case rhs @ LambdaTypeTree(tparams, body) =>
+          cpy.LambdaTypeTree(rhs)(tparams, dropInRhs(body))
+        case _ =>
+          rhs
+      }
+      cpy.TypeDef(tparam)(rhs = dropInRhs(tparam.rhs))
+    }
+
     val tparams1 = tparams mapConserve { tparam =>
       cpy.TypeDef(tparam)(rhs = desugarContextBounds(tparam.rhs))
     }
@@ -239,17 +252,12 @@ object desugar {
     def normalizedVparamss = meth1.vparamss map (_ map (vparam =>
       cpy.ValDef(vparam)(rhs = EmptyTree)))
 
-    def dropContextBound(tparam: TypeDef) = tparam.rhs match {
-      case ContextBounds(tbounds, _) => cpy.TypeDef(tparam)(rhs = tbounds)
-      case _ => tparam
-    }
-
     def defaultGetters(vparamss: List[List[ValDef]], n: Int): List[DefDef] = vparamss match {
       case (vparam :: vparams) :: vparamss1 =>
         def defaultGetter: DefDef =
           DefDef(
             name = DefaultGetterName(methName, n),
-            tparams = meth.tparams.map(tparam => dropContextBound(toDefParam(tparam))),
+            tparams = meth.tparams.map(tparam => dropContextBounds(toDefParam(tparam))),
             vparamss = takeUpTo(normalizedVparamss.nestedMap(toDefParam), n),
             tpt = TypeTree(),
             rhs = vparam.rhs

tests/pending/fuzzy/0f12f42d878dcd4cb8b8ab62dbfb6b41861989b1.scala renamed to tests/fuzzy/0f12f42d878dcd4cb8b8ab62dbfb6b41861989b1.scala

@@ -0,0 +1,4 @@
+class Foo {
+  trait M[A[_]]
+  def foo[i0[_] : M](a: List[String] = ???) = ???
+}

tests/pending/fuzzy/9baccf94095f1bd680e9bb75cc552d0784b8b9c2.scala renamed to tests/fuzzy/9baccf94095f1bd680e9bb75cc552d0784b8b9c2.scala

@@ -14,6 +14,7 @@ object Test {
       // This would "java.lang.OutOfMemoryError: Java heap space" if ModuleSerializationProxy
       // prevented class unloading.
       deserializeDynamicLoadedClass()
+      System.gc()
     }
   }