Address review comments

Author: odersky

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

@@ -128,6 +128,12 @@ trait CaptureRef extends TypeProxy, ValueType:
   final def isExclusive(using Context): Boolean =
     !isReadOnly && (isRootCapability || captureSetOfInfo.isExclusive)
 
+  /** The owning symbol associated with a capability this is
+   *   - for Fresh capabilities: the owner of the hidden set
+   *   - for TermRefs and TypeRefs: the symbol it refers to
+   *   - for derived and path capabilities: the owner of the underlying capability
+   *   - otherwise NoSymbol
+   */
   final def ccOwner(using Context): Symbol = this match
     case root.Fresh(hidden) =>
       hidden.owner
@@ -143,7 +149,12 @@ trait CaptureRef extends TypeProxy, ValueType:
     case _ =>
       NoSymbol
 
-  final def adjustedOwner(using Context): Symbol =
+  /** The symbol that represents the level closest-enclosing ccOwner.
+   *  Symbols representing levels are
+   *   - class symbols, but not inner (non-static) module classes
+   *   - method symbols, but not accessors or constructors
+   */
+  final def levelOwner(using Context): Symbol =
     def adjust(owner: Symbol): Symbol =
       if !owner.exists
         || owner.isClass && (!owner.is(Flags.Module) || owner.isStatic)
@@ -296,7 +307,7 @@ trait CaptureRef extends TypeProxy, ValueType:
       case x @ root.Fresh(hidden) =>
         def levelOK =
           if ccConfig.useFreshLevels && !CCState.ignoreFreshLevels then
-            val yOwner = y.adjustedOwner
+            val yOwner = y.levelOwner
             yOwner.isStaticOwner || x.ccOwner.isContainedIn(yOwner)
           else
             !y.stripReadOnly.isCap

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

@@ -744,7 +744,7 @@ class CheckCaptures extends Recheck, SymTransformer:
       val argType = recheck(arg, freshenedFormal)
         .showing(i"recheck arg $arg vs $freshenedFormal = $result", capt)
       if formal.hasAnnotation(defn.UseAnnot) || formal.hasAnnotation(defn.ConsumeAnnot) then
-        // The @use and/or @consume annotation is added to `formal` by `prep areFunction`
+        // The @use and/or @consume annotation is added to `formal` by `prepareFunction`
         capt.println(i"charging deep capture set of $arg: ${argType} = ${argType.deepCaptureSet}")
         markFree(argType.deepCaptureSet, arg)
       if formal.containsCap then
@@ -1277,7 +1277,7 @@ class CheckCaptures extends Recheck, SymTransformer:
           val msg = note match
             case CompareResult.LevelError(cs, ref) =>
               if ref.stripReadOnly.isCapOrFresh then
-                i"""the universa capability $ref
+                i"""the universal capability $ref
                    |cannot be included in capture set $cs"""
               else
                 val levelStr = ref match

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

@@ -868,19 +868,11 @@ object Types extends TypeUtils {
             pdenot.asSingleDenotation.derivedSingleDenotation(pdenot.symbol, overridingRefinement)
           else
             val isRefinedMethod = rinfo.isInstanceOf[MethodOrPoly]
-            val joint = try
-              CCState.ignoringFreshLevels:
+            val joint = CCState.ignoringFreshLevels:
                 pdenot.meet(
                   new JointRefDenotation(NoSymbol, rinfo, Period.allInRun(ctx.runId), pre, isRefinedMethod),
                   pre,
                   safeIntersection = ctx.base.pendingMemberSearches.contains(name))
-              pdenot.meet(
-                new JointRefDenotation(NoSymbol, rinfo, Period.allInRun(ctx.runId), pre, isRefinedMethod),
-                pre,
-                safeIntersection = ctx.base.pendingMemberSearches.contains(name))
-            catch case ex: AssertionError =>
-              println(i"error while do refined $tp . $name, ${pdenot.info} / $rinfo")
-              throw ex
             joint match
               case joint: SingleDenotation
               if isRefinedMethod

tests/neg-custom-args/captures/i15772.check

@@ -24,7 +24,7 @@
    |                             reference cap is not included in the allowed capture set ?
    |                             of the enclosing method main3
    |
-   |                             Note that the universa capability cap
+   |                             Note that the universal capability cap
    |                             cannot be included in capture set ?
 -- [E007] Type Mismatch Error: tests/neg-custom-args/captures/i15772.scala:46:2 ----------------------------------------
 46 |  x: (() -> Unit) // error

tests/neg-custom-args/captures/reaches.check

@@ -27,7 +27,7 @@
    |                           reference cap is not included in the allowed capture set ?
    |                           of the enclosing method runAll2
    |
-   |                           Note that the universa capability cap
+   |                           Note that the universal capability cap
    |                           cannot be included in capture set ?
 -- Error: tests/neg-custom-args/captures/reaches.scala:44:16 -----------------------------------------------------------
 44 |  val cur = Ref[List[Proc]](xs) // error