Widen skolem types when adding parent refinements

scala · Jan 31, 2025 · 8ec93ae · 8ec93ae
1 parent f7e5df5
commit 8ec93ae
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/compiler/src/dotty/tools/dotc/core/NamerOps.scala b/compiler/src/dotty/tools/dotc/core/NamerOps.scala
@@ -8,6 +8,7 @@ import ContextOps.enter
 import TypeApplications.EtaExpansion
 import collection.mutable
 import config.Printers.typr
+import ast.untpd
 
 /** Operations that are shared between Namer and TreeUnpickler */
 object NamerOps:
@@ -38,19 +39,20 @@ object NamerOps:
    *  unless it is null.
    */
   extension (tp: Type)
-    def separateRefinements(cls: ClassSymbol, refinements: mutable.LinkedHashMap[Name, Type] | Null)(using Context): Type =
+    def separateRefinements(cls: ClassSymbol, refinements: mutable.LinkedHashMap[Name, Type] | Null, parent: untpd.Tree)(using Context): Type =
       tp match
         case RefinedType(tp1, rname, rinfo) =>
-          try tp1.separateRefinements(cls, refinements)
+          try tp1.separateRefinements(cls, refinements, parent)
           finally
             if refinements != null then
+              val rinfo1 = rinfo.widenSkolem
               refinements(rname) = refinements.get(rname) match
-                case Some(tp) => tp & rinfo
-                case None => rinfo
+                case Some(tp) => tp & rinfo1
+                case None => rinfo1
         case tp @ AnnotatedType(tp1, ann) =>
-          tp.derivedAnnotatedType(tp1.separateRefinements(cls, refinements), ann)
+          tp.derivedAnnotatedType(tp1.separateRefinements(cls, refinements, parent), ann)
         case tp: RecType =>
-          tp.parent.substRecThis(tp, cls.thisType).separateRefinements(cls, refinements)
+          tp.parent.substRecThis(tp, cls.thisType).separateRefinements(cls, refinements, parent)
         case tp =>
           tp
 

diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -1080,7 +1080,7 @@ class TreeUnpickler(reader: TastyReader,
       }
       val parentReader = fork
       val parents = readParents(withArgs = false)(using parentCtx)
-      val parentTypes = parents.map(_.tpe.dealiasKeepAnnots.separateRefinements(cls, null))
+      val parentTypes = parents.map(p => p.tpe.dealiasKeepAnnots.separateRefinements(cls, null, p))
       if cls.is(JavaDefined) && parentTypes.exists(_.derivesFrom(defn.JavaAnnotationClass)) then
         cls.setFlag(JavaAnnotation)
       val self =

diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -1615,7 +1615,7 @@ class Namer { typer: Typer =>
         else {
           val pt = checkClassType(
               if Feature.enabled(modularity)
-              then ptype.separateRefinements(cls, parentRefinements)
+              then ptype.separateRefinements(cls, parentRefinements, parent)
               else ptype,
               parent.srcPos,
               traitReq = parent ne parents.head,

diff --git a/tests/pos/i22456.scala b/tests/pos/i22456.scala
@@ -0,0 +1,4 @@
+import language.experimental.modularity
+
+class T(tracked val y: Int)
+class C(tracked val x: Int) extends T(x + 1)