Skip to content

Commit

Permalink
Change MT reduction to simplify with Mode.Type
Browse files Browse the repository at this point in the history
Transcribing and paraphrasing from smarter's comment in
scala#16408 (comment) :

Type erasure assumes method signatures aren't simplified, since
simplification logic is implementation-defined.  For instance, some
intersection types can be simplified down, but intersection types and
their simplification can erase to different types - prefering classes
over traits, for instance (for Java interop, as it matches Java's
erasure).

Also note, simplify doesn't simplify intersections and unions in Type
mode.  But Match Types will cache their reduction without considering
the type mode as a cache input, thus the simplified reduction leaks even
when called in Type mode.

So we call simplified in Mode.Type, in both cases (another desire), so
only that result is cached instead.

Using normalise doesn't work because, for example, that doesn't
normalise match types that are applied type args (e.g. args of Pair).
And not caching the result of those reductions means that they'll get
repeat over and over.
  • Loading branch information
dwijnand committed Jun 8, 2023
1 parent 5d2812a commit 15eedb9
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 2 deletions.
4 changes: 2 additions & 2 deletions compiler/src/dotty/tools/dotc/core/TypeComparer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3192,7 +3192,7 @@ class TrackingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
}
}
case redux =>
MatchResult.Reduced(redux.simplified)
MatchResult.Reduced(redux)
case _ =>
MatchResult.Reduced(body)

Expand Down Expand Up @@ -3220,7 +3220,7 @@ class TrackingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
MatchTypeTrace.noInstance(scrut, cas, fails)
NoType
case MatchResult.Reduced(tp) =>
tp
withMode(Mode.Type)(tp.simplified)
case Nil =>
val casesText = MatchTypeTrace.noMatchesText(scrut, cases)
throw MatchTypeReductionError(em"Match type reduction $casesText")
Expand Down
26 changes: 26 additions & 0 deletions tests/pos/i16408.min1.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
object Helpers:
type NodeFun[R] = Matchable // compiles without [R] parameter

type URIFun[R] = R match
case GetURI[u] => u & NodeFun[R]

private type GetURI[U] = RDF { type URI = U }
end Helpers

trait RDF:
type URI

trait ROps[R <: RDF]:
def auth(uri: Helpers.URIFun[R]): String

object TraitRDF extends RDF:
override type URI = TraitTypes.UriImpl

val rops = new ROps[TraitRDF.type] {
override def auth(uri: Helpers.URIFun[TraitRDF.type]): String = ???
}
end TraitRDF

object TraitTypes:
trait UriImpl // doesn't compile
// class UriImpl // compiles
22 changes: 22 additions & 0 deletions tests/pos/i16408.min2.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
object Helpers:
type NodeFun[R] = Matchable // compiles without [R] parameter

type URIFun[R] = R match
case RDF[u] => u & NodeFun[R]
end Helpers

trait RDF[URIParam]

trait ROps[R <: RDF[?]]:
def auth(uri: Helpers.URIFun[R]): String

object TraitRDF extends RDF[TraitTypes.UriImpl]:

val rops = new ROps[TraitRDF.type] {
override def auth(uri: Helpers.URIFun[TraitRDF.type]): String = ???
}
end TraitRDF

object TraitTypes:
trait UriImpl // doesn't compile
// class UriImpl // compiles
57 changes: 57 additions & 0 deletions tests/pos/i16408.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import scala.util.Try

trait RDF:
rdf =>

type R = rdf.type
type Node <: Matchable
type URI <: Node

given rops: ROps[R]
end RDF

object RDF:
type Node[R <: RDF] = R match
case GetNode[n] => Matchable //n & rNode[R]

type URI[R <: RDF] <: Node[R] = R match
case GetURI[u] => u & Node[R]

private type GetNode[N] = RDF { type Node = N }
private type GetURI[U] = RDF { type URI = U }
end RDF

trait ROps[R <: RDF]:
def mkUri(str: String): Try[RDF.URI[R]]
def auth(uri: RDF.URI[R]): Try[String]

object TraitTypes:
trait Node:
def value: String

trait Uri extends Node

def mkUri(u: String): Uri =
new Uri { def value = u }

object TraitRDF extends RDF:
import TraitTypes as tz

override opaque type Node <: Matchable = tz.Node
override opaque type URI <: Node = tz.Uri

given rops: ROps[R] with
override def mkUri(str: String): Try[RDF.URI[R]] = Try(tz.mkUri(str))
override def auth(uri: RDF.URI[R]): Try[String] =
Try(java.net.URI.create(uri.value).getAuthority())

end TraitRDF

class Test[R <: RDF](using rops: ROps[R]):
import rops.given
lazy val uriT: Try[RDF.URI[R]] = rops.mkUri("https://bblfish.net/#i")
lazy val x: String = "uri authority=" + uriT.map(u => rops.auth(u))

@main def run =
val test = Test[TraitRDF.type]
println(test.x)
10 changes: 10 additions & 0 deletions tests/pos/i17257.min.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Minimisation of tests/run-macros/i17257
// to understand how changes to match type reduction
// impacted this use of Tuple.IsMappedBy.
class C[+A]
def foo[T <: Tuple : Tuple.IsMappedBy[C]] = ???
def bar[X] = foo[(
C[X], C[X], C[X], C[X], C[X], C[X], C[X], C[X], C[X], C[X],
C[X], C[X], C[X], C[X], C[X], C[X], C[X], C[X], C[X], C[X],
C[X], C[X], C[X],
)]

0 comments on commit 15eedb9

Please sign in to comment.