Skip to content

Fix #9782: hanlde F-bounds in isInstanceOf check #9789

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 6 commits into from
Sep 18, 2020
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
10 changes: 5 additions & 5 deletions compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import config.Printers.{ transforms => debug }
object TypeTestsCasts {
import ast.tpd._
import typer.Inferencing.maximizeType
import typer.ProtoTypes.constrained
import typer.ProtoTypes.{ constrained, newTypeVar }

/** Whether `(x:X).isInstanceOf[P]` can be checked at runtime?
*
Expand Down Expand Up @@ -77,13 +77,12 @@ object TypeTestsCasts {

/** Approximate type parameters depending on variance */
def stripTypeParam(tp: Type)(using Context) = new ApproximatingTypeMap {
val boundTypeParams = util.HashMap[TypeRef, TypeVar]()
def apply(tp: Type): Type = tp match {
case _: MatchType =>
tp // break cycles
case tp: TypeRef if isBounds(tp.underlying) =>
val lo = apply(tp.info.loBound)
val hi = apply(tp.info.hiBound)
range(lo, hi)
case tp: TypeRef if !tp.symbol.isClass =>
boundTypeParams.getOrElseUpdate(tp, newTypeVar(tp.underlying.toBounds))
case _ =>
mapOver(tp)
}
Expand Down Expand Up @@ -126,6 +125,7 @@ object TypeTestsCasts {
debug.println("P1 <:< P = " + res)

res

}

def recur(X: Type, P: Type): Boolean = (X <:< P) || (P.dealias match {
Expand Down
15 changes: 15 additions & 0 deletions tests/pos-special/isInstanceOf/i9782.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
trait Txn[T <: Txn[T]]

trait Elem[T <: Txn[T]]

trait Obj[T <: Txn[T]] extends Elem[T]

class Test {

def apply[Repr[~ <: Txn[~]] <: Elem[~], In <: Txn[In]](in: Repr[In]): Unit = {
in match {
case inObj: Obj[In] => // problem here
case _ =>
}
}
}
19 changes: 19 additions & 0 deletions tests/pos/i9782.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
trait Txn[T <: Txn[T]]

trait Elem[T <: Txn[T]]

trait Obj[T <: Txn[T]] extends Elem[T]

trait Copy[In <: Txn[In], Out <: Txn[Out]] {
def copyImpl[Repr[~ <: Txn[~]] <: Elem[~]](in: Repr[In]): Repr[Out]

def apply[Repr[~ <: Txn[~]] <: Elem[~]](in: Repr[In]): Repr[Out] = {
val out = copyImpl[Repr](in)
(in, out) match {
case (inObj: Obj[In], outObj: Obj[Out]) => // problem here
println("copy the attributes")
case _ =>
}
out
}
}