From 2e1ed26c563e7a104e350f03a2788c612b939ce6 Mon Sep 17 00:00:00 2001
From: odersky <odersky@gmail.com>
Date: Sat, 7 Oct 2023 16:18:44 +0200
Subject: [PATCH] A first attempt at level checking for classes

Check that instantiated root variable of a method inside a class
is nested in the instance variable of the class.

For the moment I was not able to construct a counter example where this
makes a difference.
---
 .../src/dotty/tools/dotc/cc/CheckCaptures.scala  | 16 +++++++++++++---
 .../captures/nested-classes-2.scala              |  1 -
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala b/compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala
index a7775a83d596..aa776643d2c6 100644
--- a/compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala
+++ b/compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala
@@ -319,7 +319,7 @@ class CheckCaptures extends Recheck, SymTransformer:
           includeCallCaptures(tree.symbol, tree.srcPos)
       else
         markFree(tree.symbol, tree.srcPos)
-      instantiateLocalRoots(tree.symbol, NoPrefix, pt):
+      instantiateLocalRoots(tree.symbol, NoPrefix, pt, tree.srcPos):
         super.recheckIdent(tree, pt)
 
     /** A specialized implementation of the selection rule.
@@ -349,7 +349,7 @@ class CheckCaptures extends Recheck, SymTransformer:
 
       val selType = recheckSelection(tree, qualType, name, disambiguate)
       val selCs = selType.widen.captureSet
-      instantiateLocalRoots(tree.symbol, qualType, pt):
+      instantiateLocalRoots(tree.symbol, qualType, pt, tree.srcPos):
         if selCs.isAlwaysEmpty || selType.widen.isBoxedCapturing || qualType.isBoxedCapturing then
           selType
         else
@@ -370,7 +370,7 @@ class CheckCaptures extends Recheck, SymTransformer:
      *   - `tp` is the type of a function that gets applied, either as a method
      *     or as a function value that gets applied.
      */
-    def instantiateLocalRoots(sym: Symbol, pre: Type, pt: Type)(tp: Type)(using Context): Type =
+    def instantiateLocalRoots(sym: Symbol, pre: Type, pt: Type, pos: SrcPos)(tp: Type)(using Context): Type =
       def canInstantiate =
         sym.is(Method, butNot = Accessor)
         || sym.isTerm && defn.isFunctionType(sym.info) && pt == AnySelectionProto
@@ -379,6 +379,16 @@ class CheckCaptures extends Recheck, SymTransformer:
         var tp1 = tpw
         val rootVar = CaptureRoot.Var(ctx.owner, sym)
         if sym.isLevelOwner then
+          val outerOwner = sym.skipConstructor.owner.levelOwner
+          if outerOwner.isClass then
+            val outerRoot = outerOwner.localRoot.termRef
+            outerRoot.asSeenFrom(pre, sym.owner) match
+              case outerLimit: CaptureRoot if outerLimit ne outerRoot =>
+                capt.println(i"constraining $rootVar of $sym by $outerLimit")
+                if !outerLimit.encloses(rootVar) then
+                // Should this be an assertion failure instead?
+                  report.error(em"outer instance $outerLimit does not enclose local root $rootVar", pos)
+              case _ =>
           tp1 = mapRoots(sym.localRoot.termRef, rootVar)(tp1)
           if tp1 ne tpw then
             ccSetup.println(i"INST local $sym: $tp, ${sym.localRoot} = $tp1")
diff --git a/tests/pos-custom-args/captures/nested-classes-2.scala b/tests/pos-custom-args/captures/nested-classes-2.scala
index 643584f3b719..e9e74dedb7c1 100644
--- a/tests/pos-custom-args/captures/nested-classes-2.scala
+++ b/tests/pos-custom-args/captures/nested-classes-2.scala
@@ -20,6 +20,5 @@ def test2(x1: (() => Unit), x2: (() => Unit) => Unit) =
   def test3(y1: (() => Unit), y2: (() => Unit) => Unit) =
     val cc1/*: C1^{cap[test3]}*/ = C1(y1, y2)  // error (but should be OK)
     val cc2 = cc1.c2(x1, x2)         // error (but should be OK)
-    ()
     //val cc3: cc1.C2^{cap[test2]} = cc2