Skip to content

Attempt to fix a potentially missing case in TypeComparer #5914

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

Merged
merged 1 commit into from
Mar 27, 2019
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
6 changes: 5 additions & 1 deletion compiler/src/dotty/tools/dotc/core/TypeComparer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,11 @@ class TypeComparer(initctx: Context) extends ConstraintHandling[AbsentContext] {
// widening in `fourthTry` before adding to the constraint.
if (frozenConstraint) isSubType(tp1, bounds(tp2).lo)
else isSubTypeWhenFrozen(tp1, tp2)
alwaysTrue || {
alwaysTrue ||
frozenConstraint && (tp1 match {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to have a test case that fails if the case is missing! Failing that, one can try to instrument the code to see whether the new logic makes a difference anywhere in the existing code base.

Copy link
Contributor Author

@abgruszecki abgruszecki Feb 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@odersky the following code fails without this case:

val a = newTypeVar(TypeBounds.empty)
val b = newTypeVar(TypeBounds.empty)
a <:< b
assert(a frozen_<:< b)

I think that seems potentially problematic. I believe I actually ran across this issue half a year ago, when I was trying to make my exhaustivity checker use Constraint as a constraint solver. That being said, I have 0 idea on how to make TypeComparer enter this case w/o manually triggering it.

EDIT: for clarity, I meant to hand off this PR to @smarter. I think it's useful to know that a potential problem exists and that we already have a fix for it, even if it doesn't impact the codebase yet. It seems to me that if (a <:< b) then a frozen_<:< b is a useful invariant to have.

case tp1: TypeParamRef => constraint.isLess(tp1, tp2)
case _ => false
}) || {
if (canConstrain(tp2) && !approx.low)
addConstraint(tp2, tp1.widenExpr, fromBelow = true)
else fourthTry
Expand Down
22 changes: 22 additions & 0 deletions compiler/test/dotty/tools/dotc/typer/SubtypingInvariantTests.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package dotty.tools.dotc.typer

import dotty.tools.DottyTest
import dotty.tools.dotc.core.Contexts.Context
import dotty.tools.dotc.core.Types.TypeBounds
import dotty.tools.dotc.typer.ProtoTypes.newTypeVar
import org.junit.Test

class SubtypingInvariantTests extends DottyTest {

@Test
def typeVarInvariant(): Unit = {
checkCompile("frontend", "class A") { (_, ctx0) =>
implicit val ctx: Context = ctx0
val a = newTypeVar(TypeBounds.empty)
val b = newTypeVar(TypeBounds.empty)
assert(a <:< b)
assert(a frozen_<:< b)
}
}

}