Map parents of classes with the class as owner.

Also: Print local roots with id of owner under -uniqid

Author: odersky

compiler/src/dotty/tools/dotc/cc/Setup.scala

@@ -613,10 +613,11 @@ class Setup extends PreRecheck, SymTransformer, SetupAPI:
               // why the class was picked as level owner. But self types should not be able
               // to mention other fields.
               val newSelfType = CapturingType(cinfo.selfType, CaptureSet.Var(cls))
-              ccSetup.println(i"mapped self type for $cls: $newSelfType, was $selfInfo")
-              val ps1 = ps.mapConserve(transformExplicitType(_, rootTarget = ctx.owner))
+              val ps1 = inContext(ctx.withOwner(cls)):
+                ps.mapConserve(transformExplicitType(_, rootTarget = cls))
               val newInfo = ClassInfo(prefix, cls, ps1, decls, newSelfType)
               updateInfo(cls, newInfo)
+              ccSetup.println(i"update class info of $cls with parents $ps selfinfo $selfInfo to $newInfo")
               cls.thisType.asInstanceOf[ThisType].invalidateCaches()
               if cls.is(ModuleClass) then
                 // if it's a module, the capture set of the module reference is the capture set of the self type

compiler/src/dotty/tools/dotc/core/Types.scala

@@ -5962,17 +5962,16 @@ object Types {
   }
 
   /** A type map that maps also parents and self type of a ClassInfo */
-  abstract class DeepTypeMap(using Context) extends TypeMap {
-    override def mapClassInfo(tp: ClassInfo): ClassInfo = {
+  abstract class DeepTypeMap(using Context) extends TypeMap:
+    override def mapClassInfo(tp: ClassInfo): ClassInfo =
       val prefix1 = this(tp.prefix)
-      val parents1 = tp.declaredParents mapConserve this
-      val selfInfo1: TypeOrSymbol = tp.selfInfo match {
-        case selfInfo: Type => inContext(ctx.withOwner(tp.cls))(this(selfInfo))
-        case selfInfo => selfInfo
-      }
-      tp.derivedClassInfo(prefix1, parents1, tp.decls, selfInfo1)
-    }
-  }
+      inContext(ctx.withOwner(tp.cls)):
+        val parents1 = tp.declaredParents.mapConserve(this)
+        val selfInfo1: TypeOrSymbol = tp.selfInfo match
+          case selfInfo: Type => inContext(ctx.withOwner(tp.cls))(this(selfInfo))
+          case selfInfo => selfInfo
+        tp.derivedClassInfo(prefix1, parents1, tp.decls, selfInfo1)
+  end DeepTypeMap
 
   @sharable object IdentityTypeMap extends TypeMap()(NoContext) {
     def apply(tp: Type): Type = tp

compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala

@@ -407,7 +407,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
         if tp.symbol.name == nme.LOCAL_CAPTURE_ROOT then  // TODO: Move to toTextCaptureRef
           if ctx.owner.levelOwner == tp.localRootOwner && !printDebug && shortenCap
           then Str("cap")
-          else Str(s"cap[${tp.localRootOwner.name}]")
+          else Str(s"cap[${nameString(tp.localRootOwner)}]")
         else toTextPrefixOf(tp) ~ selectionString(tp)
       case tp: ThisType =>
         nameString(tp.cls) + ".this"