-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Fix #6588: Dealias inferred quoted types #6599
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -674,6 +674,9 @@ trait Implicits { self: Typer => | |
EmptyTree | ||
} | ||
|
||
/** Synthesize the tree for `'[T]` for an implicit `scala.quoted.Type[T]`. | ||
* `T` is deeply dealiassed to avoid references to local type aliases. | ||
*/ | ||
lazy val synthesizedTypeTag: SpecialHandler = | ||
(formal: Type, span: Span) => implicit (ctx: Context) => { | ||
def quotedType(t: Type) = { | ||
|
@@ -682,26 +685,11 @@ trait Implicits { self: Typer => | |
ref(defn.InternalQuoted_typeQuote).appliedToType(t) | ||
} | ||
formal.argInfos match { | ||
case arg :: Nil if !arg.typeSymbol.is(Param) => | ||
object bindFreeVars extends TypeMap { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This |
||
var ok = true | ||
def apply(t: Type) = t match { | ||
case t @ TypeRef(NoPrefix, _) => | ||
inferImplicit(defn.QuotedTypeType.appliedTo(t), EmptyTree, span) match { | ||
case SearchSuccess(tag, _, _) if tag.tpe.isStable => | ||
tag.tpe.select(defn.QuotedType_splice) | ||
case _ => | ||
ok = false | ||
t | ||
} | ||
case _ => t | ||
} | ||
case arg :: Nil => | ||
val deepDealias = new TypeMap { | ||
def apply(tp: Type): Type = mapOver(tp.dealias) | ||
} | ||
val tag = bindFreeVars(arg) | ||
if (bindFreeVars.ok) quotedType(tag) | ||
else EmptyTree | ||
case arg :: Nil if ctx.inInlineMethod => | ||
quotedType(arg) | ||
quotedType(deepDealias(arg)) | ||
case _ => | ||
EmptyTree | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import scala.quoted._ | ||
|
||
class Test { | ||
|
||
def f[T](t: Type[T], x: Expr[T]) = '{ | ||
val z2 = $x // error // error: wrong staging level | ||
} | ||
|
||
def g[T](implicit t: Type[T], x: Expr[T]) = '{ | ||
val z2 = $x // ok | ||
} | ||
|
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import scala.quoted._ | ||
|
||
inline def foo[T:Type]: Int = 10 | ||
|
||
def main = { | ||
type S = Int | ||
foo[S] | ||
foo[Int] | ||
|
||
type T = Int => Int | ||
foo[T] | ||
foo[Int => Int] | ||
|
||
type U = List[Int] | ||
foo[U] | ||
foo[List[Int]] | ||
|
||
type N = List | ||
foo[N] | ||
foo[List] | ||
|
||
type V = List[S] | ||
foo[V] | ||
|
||
type B = V => T | ||
foo[B] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The code generated for the type tags is now def main: Int =
{
type S = Int
{
val evidence$1: quoted.Type[Int] = scala.quoted.Type.IntTag
10:Int
}
{
val evidence$1: quoted.Type[Int] = scala.quoted.Type.IntTag
10:Int
}
type T = Function1[Int, Int]
{
val evidence$1: quoted.Type[Int => Int] = '[Int => Int]
10:Int
}
{
val evidence$1: quoted.Type[Int => Int] = '[Int => Int]
10:Int
}
type U = List[Int]
{
val evidence$1: quoted.Type[List[Int]] = '[List[Int]]
10:Int
}
{
val evidence$1: quoted.Type[List[Int]] = '[List[Int]]
10:Int
}
type N = List
{
val evidence$1: quoted.Type[List] = '[List]
10:Int
}
{
val evidence$1: quoted.Type[List] = '[List]
10:Int
}
type V = List[S]
{
val evidence$1: quoted.Type[List[Int]] = '[List[Int]]
10:Int
}
type B = Function1[V, T]
{
val evidence$1: quoted.Type[List[Int] => Int => Int] =
'[List[Int] => Int => Int]
10:Int
}
}
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. After the second commit, we get ...
type V = List[S]
{
10:Int
}
type B = Function1[V, T]
{
10:Int
} |
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
(null: scala.Any).asInstanceOf[java.lang.Object] | ||
(null: scala.Any).asInstanceOf[scala.Predef.String] | ||
(null: scala.Any).asInstanceOf[java.lang.String] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be good if we could find a more systematic way to do this. Ideally, we could mark
typeQuote
to be a pure function. We have a flag for that (it'sStableRealizable
), but so far this cannot be set from source.Maybe leave a TODO that we should do the change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we have some internal flag to mark those methods?