Short-circuit match type cases with missing captures in their patterns.

So that they do not fall into the legacy fallback.

Author: sjrd

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

@@ -3238,9 +3238,10 @@ class TrackingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
     /** Match a single case. */
     def matchCase(cas: MatchTypeCaseSpec): MatchResult = trace(i"$scrut match ${MatchTypeTrace.caseText(cas)}", matchTypes, show = true) {
       cas match
-        case cas: MatchTypeCaseSpec.SubTypeTest   => matchSubTypeTest(cas)
-        case cas: MatchTypeCaseSpec.SpeccedPatMat => matchSpeccedPatMat(cas)
-        case cas: MatchTypeCaseSpec.LegacyPatMat  => matchLegacyPatMat(cas)
+        case cas: MatchTypeCaseSpec.SubTypeTest     => matchSubTypeTest(cas)
+        case cas: MatchTypeCaseSpec.SpeccedPatMat   => matchSpeccedPatMat(cas)
+        case cas: MatchTypeCaseSpec.LegacyPatMat    => matchLegacyPatMat(cas)
+        case cas: MatchTypeCaseSpec.MissingCaptures => matchMissingCaptures(cas)
     }
 
     def matchSubTypeTest(spec: MatchTypeCaseSpec.SubTypeTest): MatchResult =
@@ -3422,6 +3423,9 @@ class TrackingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
         MatchResult.Stuck
     end matchLegacyPatMat
 
+    def matchMissingCaptures(spec: MatchTypeCaseSpec.MissingCaptures): MatchResult =
+      MatchResult.Stuck
+
     def recur(remaining: List[MatchTypeCaseSpec]): Type = remaining match
       case cas :: remaining1 =>
         matchCase(cas) match

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

@@ -2,6 +2,8 @@ package dotty.tools
 package dotc
 package core
 
+import java.util as ju
+
 import Symbols._
 import Flags._
 import Names._
@@ -5080,6 +5082,7 @@ object Types {
     case SubTypeTest(origMatchCase: Type, pattern: Type, body: Type)
     case SpeccedPatMat(origMatchCase: HKTypeLambda, captureCount: Int, pattern: MatchTypeCasePattern, body: Type)
     case LegacyPatMat(origMatchCase: HKTypeLambda)
+    case MissingCaptures(origMatchCase: HKTypeLambda, missing: ju.BitSet)
 
     def origMatchCase: Type
   end MatchTypeCaseSpec
@@ -5089,16 +5092,45 @@ object Types {
       cas match
         case cas: HKTypeLambda =>
           val defn.MatchCase(pat, body) = cas.resultType: @unchecked
-          val specPattern = tryConvertToSpecPattern(cas, pat)
-          if specPattern != null then
-            SpeccedPatMat(cas, cas.paramNames.size, specPattern, body)
+          val missing = checkCapturesPresent(cas, pat)
+          if !missing.isEmpty then
+            MissingCaptures(cas, missing)
           else
-            LegacyPatMat(cas)
+            val specPattern = tryConvertToSpecPattern(cas, pat)
+            if specPattern != null then
+              SpeccedPatMat(cas, cas.paramNames.size, specPattern, body)
+            else
+              LegacyPatMat(cas)
         case _ =>
           val defn.MatchCase(pat, body) = cas: @unchecked
           SubTypeTest(cas, pat, body)
     end analyze
 
+    /** Checks that all the captures of the case are present in the case.
+     *
+     *  Sometimes, because of earlier substitutions of an abstract type constructor,
+     *  we can end up with patterns that do not mention all their captures anymore.
+     *  This can happen even when the body still refers to these missing captures.
+     *  In that case, we must always consider the case to be unmatchable, i.e., to
+     *  become `Stuck`.
+     *
+     *  See pos/i12127.scala for an example.
+     */
+    def checkCapturesPresent(cas: HKTypeLambda, pat: Type)(using Context): ju.BitSet =
+      val captureCount = cas.paramNames.size
+      val missing = new java.util.BitSet(captureCount)
+      missing.set(0, captureCount)
+      new CheckCapturesPresent(cas).apply(missing, pat)
+
+    private class CheckCapturesPresent(cas: HKTypeLambda)(using Context) extends TypeAccumulator[ju.BitSet]:
+      def apply(missing: ju.BitSet, tp: Type): ju.BitSet = tp match
+        case TypeParamRef(binder, num) if binder eq cas =>
+          missing.clear(num)
+          missing
+        case _ =>
+          foldOver(missing, tp)
+    end CheckCapturesPresent
+
     private def tryConvertToSpecPattern(caseLambda: HKTypeLambda, pat: Type)(using Context): MatchTypeCasePattern | Null =
       var typeParamRefsAccountedFor: Int = 0