Skip to content

Encode unpickle call directly on context #10238

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.

Sign up for GitHub

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 3 commits into from
Nov 9, 2020
Merged

Encode unpickle call directly on context #10238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ed2487
Encode quote unpickle quotes directly on QuoteContext
nicolasstucki Nov 9, 2020
87411b5
Add types to unpickle methods
nicolasstucki Nov 9, 2020
d35a5d7
Use Lambda constuctor
nicolasstucki Nov 9, 2020
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: 1 addition & 2 deletions compiler/src/dotty/tools/dotc/core/Definitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,7 @@ class Definitions {
@tu lazy val QuotedExprModule: Symbol = QuotedExprClass.companionModule

@tu lazy val QuoteContextClass: ClassSymbol = requiredClass("scala.quoted.QuoteContext")
@tu lazy val QuoteContextInternalClass: ClassSymbol = requiredClass("scala.internal.quoted.QuoteContextInternal")

@tu lazy val LiftableModule: Symbol = requiredModule("scala.quoted.Liftable")
@tu lazy val LiftableModule_BooleanLiftable: Symbol = LiftableModule.requiredMethod("BooleanLiftable")
Expand Down Expand Up @@ -837,8 +838,6 @@ class Definitions {
@tu lazy val TastyReflectionClass: ClassSymbol = requiredClass("scala.tasty.Reflection")

@tu lazy val PickledQuote_make: Symbol = requiredMethod("scala.internal.quoted.PickledQuote.make")
@tu lazy val PickledQuote_unpickleExpr: Symbol = requiredMethod("scala.internal.quoted.PickledQuote.unpickleExpr")
@tu lazy val PickledQuote_unpickleType: Symbol = requiredMethod("scala.internal.quoted.PickledQuote.unpickleType")

@tu lazy val EqlClass: ClassSymbol = requiredClass("scala.Eql")
def Eql_eqlAny(using Context): TermSymbol = EqlClass.companionModule.requiredMethod(nme.eqlAny)
Expand Down
8 changes: 4 additions & 4 deletions compiler/src/dotty/tools/dotc/quoted/QuoteContextImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2628,13 +2628,13 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern

end reflect

def unpickleExpr(pickledQuote: PickledQuote): scala.quoted.Expr[Any] =
def unpickleExpr[T](pickledQuote: PickledQuote): scala.quoted.Expr[T] =
val tree = PickledQuotes.unpickleTerm(pickledQuote)(using reflect.rootContext)
new scala.internal.quoted.Expr(tree, hash)
new scala.internal.quoted.Expr(tree, hash).asInstanceOf[scala.quoted.Expr[T]]
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems to me that the original type signature is better. By returning the type Expr[T], there are no guarantees.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed, there are no guarantees. Calls to this method should only be inserted be the compiler.
The previous version added the cast after each call to this method, effectively having the same guaranties.

I will add some extra documentation to make it clear that no one should be calling this method directly. Currently, it is hidden from the user as it is defined in QuoteContextInteranal.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In general, all methods in QuoteContextInteranal should only be called by code generated by the compiler or something in the library.


def unpickleType(pickledQuote: PickledQuote): scala.quoted.Type[?] =
def unpickleType[T <: AnyKind](pickledQuote: PickledQuote): scala.quoted.Type[T] =
val tree = PickledQuotes.unpickleTypeTree(pickledQuote)(using reflect.rootContext)
new scala.internal.quoted.Type(tree, hash)
new scala.internal.quoted.Type(tree, hash).asInstanceOf[scala.quoted.Type[T]]

def exprMatch(scrutinee: scala.quoted.Expr[Any], pattern: scala.quoted.Expr[Any]): Option[Tuple] =
treeMatch(scrutinee.unseal(using this), pattern.unseal(using this))
Expand Down
39 changes: 27 additions & 12 deletions compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,9 @@ class ReifyQuotes extends MacroTransform {
*/
def pickleAsLiteral(lit: Literal) = {
val exprType = defn.QuotedExprClass.typeRef.appliedTo(body.tpe)
val tpe = MethodType(defn.QuoteContextClass.typeRef :: Nil, exprType)
val meth = newSymbol(ctx.owner, UniqueName.fresh(nme.ANON_FUN), Synthetic | Method, tpe)
def mkConst(tss: List[List[Tree]]) = {
val reflect = tss.head.head.select("reflect".toTermName)
val lambdaTpe = MethodType(defn.QuoteContextClass.typeRef :: Nil, exprType)
def mkConst(ts: List[Tree]) = {
val reflect = ts.head.select("reflect".toTermName)
val typeName = body.tpe.typeSymbol.name
val literalValue =
if lit.const.tag == Constants.NullTag || lit.const.tag == Constants.UnitTag then Nil
Expand All @@ -167,7 +166,7 @@ class ReifyQuotes extends MacroTransform {
val literal = reflect.select("Literal".toTermName).select(nme.apply).appliedTo(constant)
reflect.select("TreeMethods".toTermName).select("asExpr".toTermName).appliedTo(literal).asInstance(exprType)
}
Closure(meth, mkConst).withSpan(body.span)
Lambda(lambdaTpe, mkConst).withSpan(body.span)
}

def pickleAsValue(lit: Literal) = {
Expand All @@ -190,13 +189,30 @@ class ReifyQuotes extends MacroTransform {
}
}

/** Encode quote using QuoteContextInternal.{unpickleExpr, unpickleType}
*
* Generate the code
* ```scala
* qctx => qctx.asInstanceOf[QuoteContextInternal].<unpickleExpr|unpickleType>[<type>](
* <pickledQuote>
* )
* ```
* this closure is always applied directly to the actual context and the BetaReduce phase removes it.
*/
def pickleAsTasty() = {
val unpickleMeth = if isType then defn.PickledQuote_unpickleType else defn.PickledQuote_unpickleExpr
val pickledQuoteStrings = liftList(PickledQuotes.pickleQuote(body).map(x => Literal(Constant(x))), defn.StringType)
// TODO: generate an instance of PickledSplices directly instead of passing through a List
val splicesList = liftList(splices, defn.FunctionType(1).appliedTo(defn.SeqType.appliedTo(defn.AnyType), defn.AnyType))
val pickledQuote = ref(defn.PickledQuote_make).appliedTo(pickledQuoteStrings, splicesList)
ref(unpickleMeth).appliedToType(originalTp).appliedTo(pickledQuote)
val quoteClass = if isType then defn.QuotedTypeClass else defn.QuotedExprClass
val quotedType = quoteClass.typeRef.appliedTo(originalTp)
val lambdaTpe = MethodType(defn.QuoteContextClass.typeRef :: Nil, quotedType)
def callUnpickle(ts: List[Tree]) = {
val qctx = ts.head.asInstance(defn.QuoteContextInternalClass.typeRef)
val unpickleMethName = if isType then "unpickleType" else "unpickleExpr"
qctx.select(unpickleMethName.toTermName).appliedToType(originalTp).appliedTo(pickledQuote)
}
Lambda(lambdaTpe, callUnpickle).withSpan(body.span)
}

/** Encode quote using Reflection.TypeRepr.typeConstructorOf
Expand All @@ -212,14 +228,13 @@ class ReifyQuotes extends MacroTransform {
def taggedType() =
val typeType = defn.QuotedTypeClass.typeRef.appliedTo(body.tpe)
val classTree = TypeApply(ref(defn.Predef_classOf.termRef), body :: Nil)
val tpe = MethodType(defn.QuoteContextClass.typeRef :: Nil, typeType)
val meth = newSymbol(ctx.owner, UniqueName.fresh(nme.ANON_FUN), Synthetic | Method, tpe)
def mkConst(tss: List[List[Tree]]) = {
val reflect = tss.head.head.select("reflect".toTermName)
val lambdaTpe = MethodType(defn.QuoteContextClass.typeRef :: Nil, typeType)
def callTypeConstructorOf(ts: List[Tree]) = {
val reflect = ts.head.select("reflect".toTermName)
val typeRepr = reflect.select("TypeRepr".toTermName).select("typeConstructorOf".toTermName).appliedTo(classTree)
reflect.select("TypeReprMethods".toTermName).select("asType".toTermName).appliedTo(typeRepr).asInstance(typeType)
}
Closure(meth, mkConst).withSpan(body.span)
Lambda(lambdaTpe, callTypeConstructorOf).withSpan(body.span)

if (isType) {
if (splices.isEmpty && body.symbol.isPrimitiveValueClass) taggedType()
Expand Down
6 changes: 0 additions & 6 deletions library/src/scala/internal/quoted/PickledQuote.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ trait PickledQuote:

object PickledQuote:

def unpickleExpr[T](pickledQuote: PickledQuote): QuoteContext ?=> Expr[T] =
qctx.asInstanceOf[QuoteContextInternal].unpickleExpr(pickledQuote).asInstanceOf[Expr[T]]

def unpickleType[T](pickledQuote: PickledQuote): QuoteContext ?=> Type[T] =
qctx.asInstanceOf[QuoteContextInternal].unpickleType(pickledQuote).asInstanceOf[Type[T]]

/** Create an instance of PickledExpr from encoded tasty and sequence of labmdas to fill holes
*
* @param pickled: Bytes of tasty encoded using TastyString.pickle
Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/internal/quoted/QuoteContextInternal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ trait QuoteContextInternal { self: scala.quoted.QuoteContext =>
/** Unpickle `repr` which represents a pickled `Expr` tree,
* replacing splice nodes with `holes`
*/
def unpickleExpr(pickledQuote: PickledQuote): scala.quoted.Expr[Any]
def unpickleExpr[T](pickledQuote: PickledQuote): scala.quoted.Expr[T]

/** Unpickle `repr` which represents a pickled `Type` tree,
* replacing splice nodes with `holes`
*/
def unpickleType(pickledQuote: PickledQuote): scala.quoted.Type[?]
def unpickleType[T <: AnyKind](pickledQuote: PickledQuote): scala.quoted.Type[T]

/** Pattern matches the scrutinee against the pattern and returns a tuple
* with the matched holes if successful.
Expand Down