LambdaLift: reload non-sym denotations when needed

Author: smarter

compiler/src/dotty/tools/dotc/transform/LambdaLift.scala

@@ -2,6 +2,7 @@ package dotty.tools.dotc
 package transform
 
 import MegaPhase._
+import core.Denotations.NonSymSingleDenotation
 import core.DenotTransformers._
 import core.Symbols._
 import core.Contexts._
@@ -530,7 +531,14 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisPhase =>
   override def prepareForUnit(tree: Tree)(using Context): Context =
     ctx.fresh.updateStore(Lifter, new Lifter(thisPhase))
 
+  private def reloadDenotation(tp: Type)(using Context): Unit = tp match
+    case tp: NamedType =>
+      if tp.denot.isInstanceOf[NonSymSingleDenotation] && lifter.free.contains(tp.symbol) then
+        tp.recomputeDenot()
+    case _ =>
+
   override def transformIdent(tree: Ident)(using Context): Tree = {
+    reloadDenotation(tree.tpe)
     val sym = tree.symbol
     tree.tpe match {
       case tpe @ TermRef(prefix, _) =>
@@ -549,6 +557,16 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisPhase =>
     }
   }
 
+  override def transformSelect(tree: Select)(using Context): Tree =
+    val denot = tree.denot
+    val sym = tree.symbol
+    // The Lifter updates the type of symbols using `installAfter` to give them a
+    // new `SymDenotation`, but that doesn't affect non-sym denotations, so we
+    // reload them manually here.
+    if !denot.isInstanceOf[core.SymDenotations.SymDenotation] && lifter.free.contains(sym) then
+      tree.qualifier.select(sym).withSpan(tree.span)
+    else tree
+
   override def transformApply(tree: Apply)(using Context): Apply =
     cpy.Apply(tree)(tree.fun, lifter.addFreeArgs(tree.symbol, tree.args)).withSpan(tree.span)
 

tests/pos/t6231c.scala

@@ -0,0 +1,9 @@
+object Bug {
+  def bar(ev: Any) = {
+    trait X(val x: Int) {
+      def qux: () => x.type = { () => println(ev); x }
+    }
+    (new X(1) {}).qux()
+  }
+}
+