Merge pull request scala#15558 from Linyxus/fix-gadt-approx

ckipp01 · Jun 30, 2022 · fad3175 · fad3175
2 parents 771a336 + 5a6f7e7
commit fad3175
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala
@@ -209,7 +209,15 @@ final class ProperGadtConstraint private(
   def isNarrowing: Boolean = wasConstrained
 
   override def approximation(sym: Symbol, fromBelow: Boolean)(using Context): Type = {
-    val res = approximation(tvarOrError(sym).origin, fromBelow = fromBelow)
+    val res =
+      approximation(tvarOrError(sym).origin, fromBelow = fromBelow) match
+        case tpr: TypeParamRef =>
+          // Here we do externalization when the returned type is a TypeParamRef,
+          //  b/c ConstraintHandling.approximation may return internal types when
+          //  the type variable is instantiated. See #15531.
+          externalize(tpr)
+        case tp => tp
+
     gadts.println(i"approximating $sym ~> $res")
     res
   }

diff --git a/tests/pos/i15531.scala b/tests/pos/i15531.scala
@@ -0,0 +1,9 @@
+trait Tag { val data: Int }
+
+enum EQ[A, B]:
+  case Refl[C]() extends EQ[C, C]
+
+def foo[T, B <: Tag](ev: EQ[T, B], x: T) = ev match
+  case EQ.Refl() =>
+    val i: Int = x.data
+