Introduce hard SingletonTypes

Author: mbovel

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

@@ -108,6 +108,9 @@ trait Hashable {
   protected final def doHash(bs: Binders, x1: Any, tp2: Type, tps3: List[Type]): Int =
     finishHash(bs, hashing.mix(hashSeed, x1.hashCode), 1, tp2, tps3)
 
+  protected final def doHash(x1: Any, x2: Int): Int =
+    finishHash(hashing.mix(hashing.mix(hashSeed, x1.hashCode), x2), 1)
+
   protected final def doHash(x1: Int, x2: Int): Int =
     finishHash(hashing.mix(hashing.mix(hashSeed, x1), x2), 1)
 

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

@@ -1217,7 +1217,7 @@ object Types {
       case _: TypeRef | _: MethodOrPoly => this // fast path for most frequent cases
       case tp: TermRef => // fast path for next most frequent case
         if tp.isOverloaded then tp else tp.underlying.widen
-      case tp: SingletonType => tp.underlying.widen
+      case tp: SingletonType if tp.isSoft => tp.underlying.widen
       case tp: ExprType => tp.resultType.widen
       case tp =>
         val tp1 = tp.stripped
@@ -2025,8 +2025,12 @@ object Types {
   /** A marker trait for types that are guaranteed to contain only a
    *  single non-null value (they might contain null in addition).
    */
-  trait SingletonType extends TypeProxy with ValueType {
+  trait SingletonType extends TypeProxy with ValueType with Softenable {
     def isOverloaded(using Context): Boolean = false
+
+    /** Overriden in [[ConstantType]].
+     */
+    override def isSoft = true
   }
 
   /** A trait for types that bind other types that refer to them.
@@ -2074,6 +2078,10 @@ object Types {
     }
   }
 
+  trait Softenable {
+    def isSoft: Boolean
+  }
+
 // --- NamedTypes ------------------------------------------------------------------
 
   abstract class NamedType extends CachedProxyType with ValueType { self =>
@@ -2855,15 +2863,16 @@ object Types {
   abstract case class ConstantType(value: Constant) extends CachedProxyType with SingletonType {
     override def underlying(using Context): Type = value.tpe
 
-    override def computeHash(bs: Binders): Int = doHash(value)
+    override def computeHash(bs: Binders): Int = doHash(value, if isSoft then 0 else 1)
   }
 
-  final class CachedConstantType(value: Constant) extends ConstantType(value)
+  final class CachedConstantType(value: Constant, override val isSoft: Boolean = true) extends ConstantType(value)
 
   object ConstantType {
-    def apply(value: Constant)(using Context): ConstantType = {
+    var i = 0
+    def apply(value: Constant, soft: Boolean = true)(using Context): ConstantType = {
       assertUnerased()
-      unique(new CachedConstantType(value))
+      unique(new CachedConstantType(value, soft))
     }
   }
 
@@ -3206,9 +3215,8 @@ object Types {
       TypeComparer.liftIfHK(tp1, tp2, AndType.make(_, _, checkValid = false), makeHk, _ | _)
   }
 
-  abstract case class OrType(tp1: Type, tp2: Type) extends AndOrType {
+  abstract case class OrType(tp1: Type, tp2: Type) extends AndOrType, Softenable {
     def isAnd: Boolean = false
-    def isSoft: Boolean
     private var myBaseClassesPeriod: Period = Nowhere
     private var myBaseClasses: List[ClassSymbol] = _
     /** Base classes of are the intersection of the operand base classes. */
@@ -3262,12 +3270,15 @@ object Types {
     override def widenUnionWithoutNull(using Context): Type =
       if myUnionPeriod != ctx.period then
         myUnion =
+          println(this.show)
+          println(isSoft)
           if isSoft then
             TypeComparer.lub(tp1.widenUnionWithoutNull, tp2.widenUnionWithoutNull, canConstrain = true) match
               case union: OrType => union.join
               case res => res
           else derivedOrType(tp1.widenUnionWithoutNull, tp2.widenUnionWithoutNull)
         if !isProvisional then myUnionPeriod = ctx.period
+      println(myUnion.show)
       myUnion
 
     private var atomsRunId: RunId = NoRunId
@@ -3282,7 +3293,12 @@ object Types {
           else tp1.atoms | tp2.atoms
         val tp1w = tp1.widenSingletons
         val tp2w = tp2.widenSingletons
-        myWidened = if ((tp1 eq tp1w) && (tp2 eq tp2w)) this else tp1w | tp2w
+        myWidened =
+          if isSoft then
+            if ((tp1 eq tp1w) && (tp2 eq tp2w)) this else tp1w | tp2w
+          else
+            derivedOrType(tp1w, tp2w)
+
         atomsRunId = ctx.runId
 
     override def atoms(using Context): Atoms =

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

@@ -438,7 +438,7 @@ class TreeUnpickler(reader: TastyReader,
         case BYNAMEtype =>
           ExprType(readType())
         case _ =>
-          ConstantType(readConstant(tag))
+          ConstantType(readConstant(tag), soft = false)
       }
 
       if (tag < firstLengthTreeTag) readSimpleType() else readLengthType()

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -1879,7 +1879,12 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
   def typedSingletonTypeTree(tree: untpd.SingletonTypeTree)(using Context): SingletonTypeTree = {
     val ref1 = typedExpr(tree.ref)
     checkStable(ref1.tpe, tree.srcPos, "singleton type")
-    assignType(cpy.SingletonTypeTree(tree)(ref1), ref1)
+
+    val ref2 = ref1.tpe match
+      case ConstantType(c) => ref1.withType(ConstantType(c, soft = false))
+      case _ => ref1
+
+    assignType(cpy.SingletonTypeTree(tree)(ref2), ref2)
   }
 
   def typedRefinedTypeTree(tree: untpd.RefinedTypeTree)(using Context): TypTree = {

tests/pos/widen-singletons.scala

@@ -0,0 +1,12 @@
+object Test:
+  def is2(x: 2) = true
+
+  def testValType() =
+    val x: 2 = 2
+    val v = x
+    is2(v)
+
+  def testDefReturnType() =
+    def f(): 2 = 2
+    val v = f()
+    is2(v)

tests/pos/widen-union.scala

@@ -13,12 +13,30 @@ object Test2:
     || xs.corresponds(ys)(consistent(_, _))  // error, found: Any, required: Int | String
 
 object Test3:
-
   def g[X](x: X | String): Int = ???
   def y: Boolean | String = ???
   g[Boolean](y)
   g(y)
   g[Boolean](identity(y))
   g(identity(y))
 
+object TestSingletonsInUnions:
+  def is2Or3(a: 2 | 3) = true
+
+  def testValType() =
+    val x: 2 | 3 = 2
+    val v = x
+    is2Or3(v)
+
+  def testDefReturnType() =
+    def f(): 2 | 3 = 2
+    val v = f()
+    is2Or3(v)
+
+  def testSoftUnionInHardUnion() =
+    def isStringOr3(a: String | 3) = true
 
+    def f(x: String): x.type | 3 = 3
+    val b: Boolean = true
+    val v = f(if b then "a" else "b")
+    isStringOr3(v)