Small tweaks

Author: odersky

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

@@ -42,7 +42,8 @@ case class CaptureAnnotation(refs: CaptureSet, boxed: Boolean)(cls: Symbol) exte
       case cr: TermRef => ref(cr)
       case cr: TermParamRef => untpd.Ident(cr.paramName).withType(cr)
       case cr: ThisType => This(cr.cls)
-      // TODO: Will crash if the type is an annotated type, for example `cap?`
+      case root(_) => ref(defn.captureRoot.termRef)
+      // TODO: Will crash if the type is an annotated type, for example `cap.rd`
     }
     val arg = repeated(elems, TypeTree(defn.AnyType))
     New(symbol.typeRef, arg :: Nil)

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

@@ -437,7 +437,7 @@ extension (tp: Type)
   /** Knowing that `tp` is a function type, is it an alias to a function other
    *  than `=>`?
    */
-  def isAliasFun(using Context) = tp match
+  def isAliasFun(using Context): Boolean = tp match
     case AppliedType(tycon, _) => !defn.isFunctionSymbol(tycon.typeSymbol)
     case _ => false
 

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

@@ -25,7 +25,8 @@ object root:
     case Result(binder: MethodType)
     case Fresh(hidden: CaptureSet.HiddenSet)
 
-    override def equals(other: Any): Boolean = this match
+    override def equals(other: Any): Boolean =
+      (this eq other.asInstanceOf[AnyRef]) || this.match
       case Kind.Result(b1) => other match
         case Kind.Result(b2) => b1 eq b2
         case _ => false
@@ -271,13 +272,14 @@ object root:
           case t: TermRef => t.isCap || this(x, t.widen)
           case x: ThisType => false
           case _ => foldOver(x, t)
-    def containsFresh(x: Type | CaptureSet): Boolean = x match
+
+    def containsCap(x: Type | CaptureSet): Boolean = x match
       case tp: Type =>
         hasCap(false, tp)
       case refs: CaptureSet =>
         refs.elems.exists(_.stripReadOnly.isCap)
 
-    if refs.exists(containsFresh) then ctx.withProperty(PrintFresh, Some(()))
+    if refs.exists(containsCap) then ctx.withProperty(PrintFresh, Some(()))
     else ctx
   end printContext
 end root