Fix the fix

odersky · odersky · commit 4196aa5748e1 · 2018-12-17T18:01:59.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
@@ -1648,7 +1648,7 @@ class TypeComparer(initctx: Context) extends ConstraintHandling {
             tp1.derivedRefinedType(tp1.parent & tp2.parent, tp1.refinedName, jointInfo)
           }
           catch {
-            case ex: MergeError => tp1.parent & tp2.parent
+            case ex: MergeError => NoType
           }
         case _ =>
           NoType

Original file line number	Diff line number	Diff line change
`@@ -1648,7 +1648,7 @@ class TypeComparer(initctx: Context) extends ConstraintHandling {`
`1648`	`1648`	`tp1.derivedRefinedType(tp1.parent & tp2.parent, tp1.refinedName, jointInfo)`
`1649`	`1649`	`}`
`1650`	`1650`	`catch {`
`1651`		`- case ex: MergeError => tp1.parent & tp2.parent`
	`1651`	`+ case ex: MergeError => NoType`
`1652`	`1652`	`}`
`1653`	`1653`	`case _ =>`
`1654`	`1654`	`NoType`