Simplify setup

Author: odersky

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

@@ -49,7 +49,7 @@ object ccConfig:
 
   /** Not used currently. Handy for trying out new features */
   def newScheme(using Context): Boolean =
-    Feature.sourceVersion.stable.isAtLeast(SourceVersion.`3.7`)
+    Feature.sourceVersion.stable.isAtLeast(SourceVersion.`3.8`)
 
 end ccConfig
 

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

@@ -220,7 +220,7 @@ object CheckCaptures:
 
   trait CheckerAPI:
     /** Complete symbol info of a val or a def */
-    def completeDef(tree: ValOrDefDef, sym: Symbol, newInfo: Type)(using Context): Type
+    def completeDef(tree: ValOrDefDef, sym: Symbol, completer: LazyType)(using Context): Type
 
     extension [T <: Tree](tree: T)
 
@@ -323,10 +323,8 @@ class CheckCaptures extends Recheck, SymTransformer:
         case t @ CapturingType(parent, refs) =>
           refs match
             case refs: CaptureSet.Var if !refs.isConst =>
-              if variance < 0 then
-                refs.solve()
-              else if ccConfig.newScheme && !sym.isAnonymousFunction then
-                refs.markSolved(provisional = !sym.isMutableVar)
+              if variance < 0 then refs.solve()
+              else refs.markSolved(provisional = !sym.isMutableVar)
             case _ =>
           traverse(parent)
         case t @ defn.RefinedFunctionOf(rinfo) =>
@@ -1089,9 +1087,7 @@ class CheckCaptures extends Recheck, SymTransformer:
      *  these checks can appear out of order, we need to first create the correct
      *  environment for checking the definition.
      */
-    def completeDef(tree: ValOrDefDef, sym: Symbol, newInfo: Type)(using Context): Type =
-      val completer = sym.infoOrCompleter
-      sym.info = newInfo
+    def completeDef(tree: ValOrDefDef, sym: Symbol, completer: LazyType)(using Context): Type =
       val saved = curEnv
       try
         // Setup environment to reflect the new owner.

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

@@ -535,8 +535,6 @@ class Setup extends PreRecheck, SymTransformer, SetupAPI:
   def setupTraverser(checker: CheckerAPI) = new TreeTraverserWithPreciseImportContexts:
     import checker.*
 
-    private val paramSigChange = util.EqHashSet[Tree]()
-
     /** Transform type of tree, and remember the transformed type as the type of the tree
      *  @pre !(boxed && sym.exists)
      */
@@ -547,8 +545,6 @@ class Setup extends PreRecheck, SymTransformer, SetupAPI:
           then transformInferredType(tree.tpe)
           else transformExplicitType(tree.tpe, sym, freshen = !boxed, tptToCheck = tree)
         if boxed then transformed = box(transformed)
-        if sym.is(Param) && (transformed ne tree.tpe) then
-          paramSigChange += tree
         tree.setNuType(
           if sym.hasAnnotation(defn.UncheckedCapturesAnnot) then makeUnchecked(transformed)
           else transformed)
@@ -653,19 +649,19 @@ class Setup extends PreRecheck, SymTransformer, SetupAPI:
           else tree.tpt.nuType
 
         // A test whether parameter signature might change. This returns true if one of
-        // the parameters has a new type installee. The idea here is that we store a new
+        // the parameters has a new type installed. The idea here is that we store a new
         // type only if the transformed type is different from the original.
         def paramSignatureChanges = tree.match
           case tree: DefDef =>
             tree.paramss.nestedExists:
-              case param: ValDef =>  paramSigChange.contains(param.tpt)
-              case param: TypeDef => paramSigChange.contains(param.rhs)
+              case param: ValDef =>  param.tpt.hasNuType
+              case param: TypeDef => param.rhs.hasNuType
           case _ => false
 
         // A symbol's signature changes if some of its parameter types or its result type
         // have a new type installed here (meaning hasRememberedType is true)
         def signatureChanges =
-          tree.tpt.hasNuType && !sym.isConstructor || paramSignatureChanges
+          tree.tpt.hasNuType || paramSignatureChanges
 
         // Replace an existing symbol info with inferred types where capture sets of
         // TypeParamRefs and TermParamRefs are put in correspondence by BiTypeMaps with the
@@ -707,12 +703,11 @@ class Setup extends PreRecheck, SymTransformer, SetupAPI:
 
         // If there's a change in the signature, update the info of `sym`
         if sym.exists && signatureChanges then
-          val newInfo =
-            root.toResultInResults(report.error(_, tree.srcPos)):
-              integrateRT(sym.info, sym.paramSymss, localReturnType, Nil, Nil)
-            .showing(i"update info $sym: ${sym.info} = $result", capt)
-          if newInfo ne sym.info then
-            val updatedInfo =
+          val updatedInfo =
+              val newInfo =
+                root.toResultInResults(report.error(_, tree.srcPos)):
+                  integrateRT(sym.info, sym.paramSymss, localReturnType, Nil, Nil)
+                .showing(i"update info $sym: ${sym.info} = $result", capt)
               if sym.isAnonymousFunction
                   || sym.is(Param)
                   || sym.is(ParamAccessor)
@@ -728,8 +723,9 @@ class Setup extends PreRecheck, SymTransformer, SetupAPI:
                   assert(ctx.phase == thisPhase.next, i"$sym")
                   capt.println(i"forcing $sym, printing = ${ctx.mode.is(Mode.Printing)}")
                   //if ctx.mode.is(Mode.Printing) then new Error().printStackTrace()
-                  completeDef(tree, sym, newInfo)
-            updateInfo(sym, updatedInfo)
+                  sym.info = newInfo
+                  completeDef(tree, sym, this)
+          updateInfo(sym, updatedInfo)
 
       case tree: Bind =>
         val sym = tree.symbol

tests/neg-custom-args/captures/cc-this.check

@@ -1,19 +1,19 @@
--- [E007] Type Mismatch Error: tests/neg-custom-args/captures/cc-this.scala:11:15 --------------------------------------
-11 |    val y: C = this // error
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/cc-this.scala:10:15 --------------------------------------
+10 |    val y: C = this // error
    |               ^^^^
    |               Found:    (C.this : C^{C.this.x})
    |               Required: C
    |
    | longer explanation available when compiling with `-explain`
--- Error: tests/neg-custom-args/captures/cc-this.scala:13:15 -----------------------------------------------------------
-13 |  class C2(val x: () => Int): // error
+-- Error: tests/neg-custom-args/captures/cc-this.scala:12:15 -----------------------------------------------------------
+12 |  class C2(val x: () => Int): // error
    |               ^
    |    reference (C2.this.x : () => Int) is not included in the allowed capture set {} of the self type of class C2
--- Error: tests/neg-custom-args/captures/cc-this.scala:20:8 ------------------------------------------------------------
-20 |  class C4(val f: () => Int) extends C3 // error
+-- Error: tests/neg-custom-args/captures/cc-this.scala:19:8 ------------------------------------------------------------
+19 |  class C4(val f: () => Int) extends C3 // error
    |  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |reference (C4.this.f : () => Int) captured by this self type is not included in the allowed capture set {} of pure base class class C3
--- Error: tests/neg-custom-args/captures/cc-this.scala:34:8 ------------------------------------------------------------
-34 |  def c3 = c2.y // error
+-- Error: tests/neg-custom-args/captures/cc-this.scala:33:8 ------------------------------------------------------------
+33 |  def c3 = c2.y // error
    |        ^
    |      Separation failure: method c3's inferred result type C{val x: () => Int}^{cc} hides non-local parameter cc

tests/neg-custom-args/captures/cc-this.scala

@@ -1,4 +1,3 @@
-import language.`3.8`
 import caps.consume
 
 class Cap extends caps.Capability
@@ -26,7 +25,7 @@ def test2(using @consume cc: Cap) =
     val y: C^ = this
 
   def f = () =>
-    eff
+    eff(using cc)
     1
 
   def c1 = new C(f)