Skip to content

More IDE work #2885

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 6 commits into from
Jul 20, 2017
Merged

More IDE work #2885

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
442915b
Make namedTrees surivive TypeErrors
odersky Jul 18, 2017
2cb53d9
Fix build problem
odersky Jul 18, 2017
221320f
Avoid unnecessary narrowLiftedOwner in markFree
odersky Jul 19, 2017
49fd9bd
Null out closure in LazyRef after use
odersky Jul 19, 2017
2f6cb08
Fix LazyRef closure removal.
odersky Jul 19, 2017
0a8a2a3
Null out closure in LazyBodyAnnotation
odersky Jul 19, 2017
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: 2 additions & 1 deletion compiler/src/dotty/tools/dotc/core/Annotations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,15 @@ object Annotations {
def tree(implicit ctx: Context) = body
}

case class LazyBodyAnnotation(bodyExpr: Context => Tree) extends BodyAnnotation {
case class LazyBodyAnnotation(private var bodyExpr: Context => Tree) extends BodyAnnotation {
Copy link
Member

Choose a reason for hiding this comment

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

It's suspicious that a Context => Tree function would capture a Context.

Copy link
Member

Choose a reason for hiding this comment

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

Oh actually I guess this is intentional: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/typer/Inliner.scala#L193

private var evaluated = false
private var myBody: Tree = _
def tree(implicit ctx: Context) = {
if (evaluated) assert(myBody != null)
else {
evaluated = true
myBody = bodyExpr(ctx)
bodyExpr = null
}
myBody
}
Expand Down