WIP: Also mark free global classes

 1. Add capture sets also for self types of global classes
 2. Also mark free capabilities in global classes

Author: odersky

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

@@ -589,7 +589,7 @@ class CheckCaptures extends Recheck, SymTransformer:
                 tree.srcPos)
 
       def recur(cs: CaptureSet, env: Env, lastEnv: Env | Null): Unit =
-        if env.kind != EnvKind.Boxed && !env.owner.isStaticOwner && !cs.isAlwaysEmpty then
+        if env.kind != EnvKind.Boxed && !cs.isAlwaysEmpty then
           // Only captured references that are visible from the environment
           // should be included.
           val included = cs.filter: c =>

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

@@ -723,11 +723,10 @@ class Setup extends PreRecheck, SymTransformer, SetupAPI:
         val cinfo @ ClassInfo(prefix, _, ps, decls, selfInfo) = cls.classInfo
 
         // Compute new self type
-        def isInnerModule = cls.is(ModuleClass) && !cls.isStatic
         val selfInfo1 =
-          if (selfInfo ne NoType) && !isInnerModule then
+          if (selfInfo ne NoType) && !cls.is(ModuleClass) then
             // if selfInfo is explicitly given then use that one, except if
-            // self info applies to non-static modules, these still need to be inferred
+            // self info applies to a module class, these still need to be inferred
             selfInfo
           else if cls.isPureClass then
             // is cls is known to be pure, nothing needs to be added to self type

compiler/src/dotty/tools/dotc/transform/Recheck.scala

@@ -242,11 +242,15 @@ abstract class Recheck extends Phase, SymTransformer:
       if name.is(OuterSelectName) then tree.tpe
       else
         val pre = ta.maybeSkolemizePrefix(qualType, name)
+        val treeSym = tree.symbol.orElse:
+          tree.tpe match
+            case TermRef(_, desig: Symbol) => desig
+            case _ => NoSymbol
         val mbr =
           sharpen(
             qualType.findMember(name, pre,
               excluded = if tree.symbol.is(Private) then EmptyFlags else Private
-          )).suchThat(tree.symbol == _)
+          )).suchThat(_ == treeSym)
         val newType = tree.tpe match
           case prevType: NamedType =>
             val prevDenot = prevType.denot
@@ -381,6 +385,9 @@ abstract class Recheck extends Phase, SymTransformer:
           assert(fntpe.paramInfos.hasSameLengthAs(tree.args))
           val argTypes = tree.args.map(recheck(_))
           constFold(tree, fntpe.instantiate(argTypes))
+        case NoType =>
+          println(i"MISSING TYPE FOR $tree")
+          tree.tpe
 
     def recheckTyped(tree: Typed)(using Context): Type =
       val tptType = recheck(tree.tpt)

library/src/scala/collection/StringOps.scala

@@ -160,7 +160,7 @@ object StringOps {
   }
 
   /** Avoid an allocation in [[collect]]. */
-  private val fallback: Any => Any = _ => fallback
+  private val fallback: Any -> Any = _ => fallback
 }
 
 /** Provides extension methods for strings.