Merge pull request #15217 from dotty-staging/fix-15181

Eta expand export forwarders that have context function types
scala · May 24, 2022 · 9d68778 · 9d68778
2 parents 6783853 + 8748cff
commit 9d68778
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala
@@ -385,7 +385,7 @@ object Erasure {
       case _: FunProto | AnyFunctionProto => tree
       case _ => tree.tpe.widen match
         case mt: MethodType if tree.isTerm =>
-          assert(mt.paramInfos.isEmpty)
+          assert(mt.paramInfos.isEmpty)//, i"bad adapt for $tree: $mt")
           adaptToType(tree.appliedToNone, pt)
         case tpw =>
           if (pt.isInstanceOf[ProtoType] || tree.tpe <:< pt)

diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -1229,6 +1229,7 @@ class Namer { typer: Typer =>
               val (pathRefss, methRefss) = prefss.splitAt(extensionParamsCount(path.tpe.widen))
               val ref = path.appliedToArgss(pathRefss).select(sym.asTerm)
               ref.appliedToArgss(adaptForwarderParams(Nil, sym.info, methRefss))
+                .etaExpandCFT(using ctx.withOwner(forwarder))
             })
             if forwarder.isInlineMethod then
               PrepareInlineable.registerInlineInfo(forwarder, ddef.rhs)

diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist
@@ -18,6 +18,7 @@ i7740b.scala
 i6507b.scala
 i12299a.scala
 i13871.scala
+i15181.scala
 
 # Tree is huge and blows stack for printing Text
 i7034.scala

diff --git a/tests/pos/i15181.scala b/tests/pos/i15181.scala
@@ -0,0 +1,9 @@
+object prelude:
+  //def scombine[A](x: A, y: A): Semigroup[A] ?=> A = Semigroup.scombine(x,y)
+  export Semigroup.*
+
+trait Semigroup[A]:
+  def scombine(x: A, y: A): A
+
+object Semigroup:
+  def scombine[A](x: A, y: A) = (s: Semigroup[A]) ?=> s.scombine(x,y)