Try to remove CaptureParam flag

Author: noti0na1

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

@@ -380,8 +380,6 @@ object Flags {
   /** Tracked modifier for class parameter / a class with some tracked parameters */
   val (Tracked @ _, _, Dependent @ _) = newFlags(46, "tracked")
 
-  val (CaptureParam @ _, _, _) = newFlags(47, "capture-param")
-
   // ------------ Flags following this one are not pickled ----------------------------------
 
   /** Symbol is not a member of its owner */
@@ -438,6 +436,8 @@ object Flags {
   /** Symbol is a constructor proxy (either companion, or apply method) */
   val (ConstructorProxy @ _, _, _) = newFlags(62, "<constructor proxy>") // (could be merged with Lifted)
 
+  val CaptureParam = ConstructorProxy
+
 // --------- Combined Flag Sets and Conjunctions ----------------------
 
   /** All possible flags */
@@ -471,7 +471,7 @@ object Flags {
   val FromStartFlags: FlagSet = commonFlags(
     Module, Package, Deferred, Method, Case, Enum, Param, ParamAccessorOrInto,
     Scala2SpecialFlags, MutableOrOpen, Opaque, Touched, JavaStatic,
-    OuterOrCovariant, LabelOrContravariant, CaseAccessor, Tracked, CaptureParam,
+    OuterOrCovariant, LabelOrContravariant, CaseAccessor, Tracked,
     Extension, NonMember, Implicit, Given, Permanent, Synthetic, Exported,
     SuperParamAliasOrScala2x, Inline, Macro, ConstructorProxy, Invisible)
 

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

@@ -770,9 +770,7 @@ object Types extends TypeUtils {
         case tp: ClassInfo => tp.appliedRef
         case _ => widenIfUnstable
       }
-      // The dummy term capture variable can only be found in a capture set.
-      val excluded1 = if ctx.mode.is(Mode.InCaptureSet) then excluded else excluded | CaptureParam
-      findMember(name, pre, required, excluded1)
+      findMember(name, pre, required, excluded)
     }
 
     /** The implicit members with given name. If there are none and the denotation

compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala

@@ -162,9 +162,7 @@ trait TypeAssigner {
             // if this fails.
             ctx.javaFindMember(name, pre, lookInCompanion = false)
           else
-            // The dummy term capture variable can only be found in a capture set.
-            val excluded = if ctx.mode.is(Mode.InCaptureSet) then EmptyFlags else CaptureParam
-            qualType.findMember(name, pre, excluded = excluded)
+            qualType.findMember(name, pre)
 
         if reallyExists(mbr) && NamedType.validPrefix(qualType) then qualType.select(name, mbr)
         else if qualType.isErroneous || name.toTermName == nme.ERROR then UnspecifiedErrorType

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -626,10 +626,8 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
       val saved2 = foundUnderScala2
       unimported = Set.empty
       foundUnderScala2 = NoType
-      // The dummy term capture variable can only be found in a capture set.
-      val excluded = if ctx.mode.is(Mode.InCaptureSet) then EmptyFlags else CaptureParam
       try
-        val found = findRef(name, pt, EmptyFlags, excluded, tree.srcPos)
+        val found = findRef(name, pt, EmptyFlags, EmptyFlags, tree.srcPos)
         if foundUnderScala2.exists && !(foundUnderScala2 =:= found) then
           report.migrationWarning(
             em"""Name resolution will change.
@@ -651,7 +649,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
      */
     def checkNotShadowed(ownType: Type): Type =
       ownType match
-        case ownType: TermRef if ownType.symbol.is(ConstructorProxy) =>
+        case ownType: TermRef if ownType.symbol.is(ConstructorProxy) && !ctx.mode.is(Mode.InCaptureSet) =>
           findRef(name, pt, EmptyFlags, ConstructorProxy, tree.srcPos) match
             case shadowed: TermRef if !shadowed.symbol.maybeOwner.isEmptyPackage =>
               pt match

tests/pos-custom-args/captures/correct-capture-variable-resolve.scala

@@ -0,0 +1,4 @@
+import language.experimental.captureChecking
+
+def f(x: AnyRef^, C: AnyRef^) =
+  def g[C^ <: {x}](y: AnyRef^{C}): AnyRef^{x} = y