Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not propagate TypeErrors of ops from TypeComparer#tryAlso #21070

Merged
merged 1 commit into from
Jul 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion compiler/src/dotty/tools/dotc/core/TypeComparer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1954,7 +1954,8 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
// check whether `op2` generates a weaker constraint than `op1`
val leftConstraint = constraint
constraint = preConstraint
if !(op && subsumes(leftConstraint, constraint, preConstraint)) then
val res = try op catch case _: TypeError => false
if !(res && subsumes(leftConstraint, constraint, preConstraint)) then
if constr != noPrinter && !subsumes(constraint, leftConstraint, preConstraint) then
constr.println(i"CUT - prefer $leftConstraint over $constraint")
constraint = leftConstraint
Expand Down
36 changes: 36 additions & 0 deletions tests/pos-deep-subtype/i21015.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@

type Init[Coll[_], A, T <: Tuple] = T match
case EmptyTuple => A
case head *: rest => InitCons[Coll, A, head, rest]

type InitCons[Coll[_], A, H, Rest <: Tuple] = H match
case Int => Init[Coll, Coll[A], Rest]
case _ => Unit

def fillVector[A, T <: Tuple](dims: T)(x: => A): Init[Vector, A, T] =
dims match
case _: EmptyTuple => x
case (p : (head *: rest)) =>
val (head *: rest) = p
head match
case size: Int => fillVector(rest)(Vector.fill(size)(x))
case _ => ()


object Minimization:

type M1[A] = Int match
case 1 => M2[A]

type M2[A] = Int match
case 2 => M1[Option[A]]

def m1[A](x: A): M1[A] = ???

val _: M1[Int] = m1(1) // was error
val _: M1[Int] = m1[Int](1) // ok
val _: M1[Int] =
val x = m1(1)
x // ok

end Minimization
Loading