Fix memoizeGivenAliases

odersky · odersky · commit 123e68a574f3 · 2019-07-26T14:03:53.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/typer/MemoizeGivenAliases.scala b/compiler/src/dotty/tools/dotc/typer/MemoizeGivenAliases.scala
@@ -42,13 +42,13 @@ trait MemoizeGivenAliases { this: Typer =>
           pre match {
             case NoPrefix => false
             case pre: ThisType => pre.cls != meth.owner.enclosingClass
+            case _ => true
           }
         case _ => true
       }
       if (needsMemo) {
-        val memoized =
-          untpd.Apply(untpd.ref(defn.Compiletime_memo.termRef), untpd.TypedSplice(rhs) :: Nil)
-        typed(memoized, rhsType)
+        val memoized = ref(defn.Compiletime_memo).appliedToType(rhsType).appliedTo(rhs)
+        adapt(memoized, rhsType)
       }
       else rhs
     case _ => rhs

Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,13 @@ trait MemoizeGivenAliases { this: Typer =>`
`42`	`42`	`pre match {`
`43`	`43`	`case NoPrefix => false`
`44`	`44`	`case pre: ThisType => pre.cls != meth.owner.enclosingClass`
	`45`	`+ case _ => true`
`45`	`46`	`}`
`46`	`47`	`case _ => true`
`47`	`48`	`}`
`48`	`49`	`if (needsMemo) {`
`49`		`- val memoized =`
`50`		`- untpd.Apply(untpd.ref(defn.Compiletime_memo.termRef), untpd.TypedSplice(rhs) :: Nil)`
`51`		`- typed(memoized, rhsType)`
	`50`	`+ val memoized = ref(defn.Compiletime_memo).appliedToType(rhsType).appliedTo(rhs)`
	`51`	`+ adapt(memoized, rhsType)`
`52`	`52`	`}`
`53`	`53`	`else rhs`
`54`	`54`	`case _ => rhs`