Skip to content

Avoid pickling '(x) when x is a captured parameter #4149

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 1 commit into from
Mar 23, 2018
Merged

Avoid pickling '(x) when x is a captured parameter #4149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Empty file added Foo.scala
View file
Open in desktop
Empty file.
15 changes: 10 additions & 5 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 @@ -329,9 +329,14 @@ class ReifyQuotes extends MacroTransformWithImplicits {
if (isType) ref(defn.typeQuoteMethod).appliedToType(body1.tpe.widen)
else ref(defn.quoteMethod).appliedToType(body1.tpe.widen).appliedTo(body1)
}
else {
val (body1, splices) = nested(isQuote = true).split(body)
pickledQuote(body1, splices, isType).withPos(quote.pos)
else body match {
case body: RefTree if isCaptured(body, level + 1) =>
// Optimization: avoid the full conversion when capturing `x`
// in '{ x } to '{ x$1.unary_~ } and go directly to `x$1`
capturers(body.symbol)(body)
case _=>
val (body1, splices) = nested(isQuote = true).split(body)
pickledQuote(body1, splices, isType).withPos(quote.pos)
}
}

Expand Down Expand Up @@ -433,7 +438,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
}

/** Returns true if this tree will be captured by `makeLambda` */
private def isCaptured(tree: RefTree)(implicit ctx: Context): Boolean = {
private def isCaptured(tree: RefTree, level: Int)(implicit ctx: Context): Boolean = {
// Check phase consistency and presence of capturer
level == 1 && !tree.symbol.is(Inline) && levelOf.get(tree.symbol).contains(1) &&
capturers.contains(tree.symbol)
Expand Down Expand Up @@ -473,7 +478,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
splice(ref(splicedType).select(tpnme.UNARY_~))
case tree: Select if tree.symbol.isSplice =>
splice(tree)
case tree: RefTree if isCaptured(tree) =>
case tree: RefTree if isCaptured(tree, level) =>
val capturer = capturers(tree.symbol)
splice(capturer(tree).select(if (tree.isTerm) nme.UNARY_~ else tpnme.UNARY_~))
case Block(stats, _) =>
Expand Down