Fix #1515: Don't narrow gadt bounds when frozen

Fixes #1515. Review by @smarter.

1 files changed, 22 insertions, 21 deletions

diff --git a/src/dotty/tools/dotc/core/TypeComparer.scala b/src/dotty/tools/dotc/core/TypeComparer.scala
index b495f00d0..1980fe50d 100644
--- a/src/dotty/tools/dotc/core/TypeComparer.scala
+++ b/src/dotty/tools/dotc/core/TypeComparer.scala
@@ -965,28 +965,29 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling {
    *  Test that the resulting bounds are still satisfiable.
    */
   private def narrowGADTBounds(tr: NamedType, bound: Type, isUpper: Boolean): Boolean =
-    ctx.mode.is(Mode.GADTflexible) && {
-    val tparam = tr.symbol
-    typr.println(i"narrow gadt bound of $tparam: ${tparam.info} from ${if (isUpper) "above" else "below"} to $bound ${bound.isRef(tparam)}")
-    if (bound.isRef(tparam)) false
-    else bound match {
-      case bound: TypeRef
-      if bound.symbol.is(BindDefinedType) && ctx.gadt.bounds.contains(bound.symbol) &&
-         !tr.symbol.is(BindDefinedType) =>
-        // Avoid having pattern-bound types in gadt bounds,
-        // as these might be eliminated once the pattern is typechecked.
-        // Pattern-bound type symbols should be narrowed first, only if that fails
-        // should symbols in the environment be constrained.
-        narrowGADTBounds(bound, tr, !isUpper)
-      case _ =>
-        val oldBounds = ctx.gadt.bounds(tparam)
-        val newBounds =
-          if (isUpper) TypeBounds(oldBounds.lo, oldBounds.hi & bound)
-          else TypeBounds(oldBounds.lo | bound, oldBounds.hi)
-        isSubType(newBounds.lo, newBounds.hi) &&
-        { ctx.gadt.setBounds(tparam, newBounds); true }
+    ctx.mode.is(Mode.GADTflexible) && !frozenConstraint && {
+      val tparam = tr.symbol
+      typr.println(i"narrow gadt bound of $tparam: ${tparam.info} from ${if (isUpper) "above" else "below"} to $bound ${bound.isRef(tparam)}")
+      if (bound.isRef(tparam)) false
+      else bound match {
+        case bound: TypeRef
+        if bound.symbol.is(BindDefinedType) &&
+           ctx.gadt.bounds.contains(bound.symbol) &&
+           !tr.symbol.is(BindDefinedType) =>
+          // Avoid having pattern-bound types in gadt bounds,
+          // as these might be eliminated once the pattern is typechecked.
+          // Pattern-bound type symbols should be narrowed first, only if that fails
+          // should symbols in the environment be constrained.
+          narrowGADTBounds(bound, tr, !isUpper)
+        case _ =>
+          val oldBounds = ctx.gadt.bounds(tparam)
+          val newBounds =
+            if (isUpper) TypeBounds(oldBounds.lo, oldBounds.hi & bound)
+            else TypeBounds(oldBounds.lo | bound, oldBounds.hi)
+          isSubType(newBounds.lo, newBounds.hi) &&
+            { ctx.gadt.setBounds(tparam, newBounds); true }
+      }
     }
-  }
 
   // Tests around `matches`