Skip to content

Fixes for lambda lift #1133

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 9 commits into from
Mar 7, 2016
Merged

Fixes for lambda lift #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
adc4f82
Fix a loophole where outer paths are missing at phase lambda lift.
odersky Mar 1, 2016
67de3d3
Fix outer paths generated during lambda lift from constructors.
odersky Mar 1, 2016
e94e8ef
Handle local traits in lambda lift
odersky Mar 1, 2016
9d3424d
Simplification: get rid of local trait methods
odersky Mar 2, 2016
69b6b89
LambdaLift redesign
odersky Mar 2, 2016
25da215
Fix call propagation from constructor to class
odersky Mar 2, 2016
f02cb0c
Cleanup lambda lift
odersky Mar 3, 2016
ff27c8c
Drop accidentally left-in inhibitor switch
odersky Mar 3, 2016
cf2fed8
Address reviewer comments.
odersky Mar 7, 2016
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
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/Compiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class Compiler {
new Constructors, // constructors changes decls in transformTemplate, no InfoTransformers should be added after it
new FunctionalInterfaces,
new GetClass), // getClass transformation should be applied to specialized methods
List(new LambdaLift, // in this mini-phase block scopes are incorrect. No phases that rely on scopes should be here
List(new LambdaLift, // in this mini-phase block scopes are incorrect. No phases that rely on scopes should be here
new ElimStaticThis,
new Flatten,
// new DropEmptyCompanions,
Expand Down
13 changes: 9 additions & 4 deletions src/dotty/tools/dotc/transform/ExplicitOuter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ object ExplicitOuter {
private def hasOuterParam(cls: ClassSymbol)(implicit ctx: Context): Boolean =
!cls.is(Trait) && needsOuterIfReferenced(cls) && outerAccessor(cls).exists

/** Tree references a an outer class of `cls` which is not a static owner.
/** Tree references an outer class of `cls` which is not a static owner.
*/
def referencesOuter(cls: Symbol, tree: Tree)(implicit ctx: Context): Boolean = {
def isOuter(sym: Symbol) =
Expand All @@ -231,7 +231,12 @@ object ExplicitOuter {
case _ => false
}
case nw: New =>
isOuter(nw.tpe.classSymbol.owner.enclosingClass)
val newCls = nw.tpe.classSymbol
isOuter(newCls.owner.enclosingClass) ||
newCls.owner.isTerm && cls.isProperlyContainedIn(newCls)
// newCls might get proxies for free variables. If current class is
// properly contained in newCls, it needs an outer path to newCls access the
// proxies and forward them to the new instance.
case _ =>
false
}
Expand Down Expand Up @@ -308,7 +313,7 @@ object ExplicitOuter {
/** The path of outer accessors that references `toCls.this` starting from
Copy link
Member

@smarter smarter Mar 2, 2016

Choose a reason for hiding this comment

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

Comment should be updated to say "starting from the node start" I think.

* the context owner's this node.
*/
def path(toCls: Symbol): Tree = try {
def path(toCls: Symbol, start: Tree = This(ctx.owner.enclosingClass.asClass)): Tree = try {
def loop(tree: Tree): Tree = {
val treeCls = tree.tpe.widen.classSymbol
val outerAccessorCtx = ctx.withPhaseNoLater(ctx.lambdaLiftPhase) // lambdalift mangles local class names, which means we cannot reliably find outer acessors anymore
Expand All @@ -317,7 +322,7 @@ object ExplicitOuter {
else loop(tree.select(outerAccessor(treeCls.asClass)(outerAccessorCtx)).ensureApplied)
}
ctx.log(i"computing outerpath to $toCls from ${ctx.outersIterator.map(_.owner).toList}")
loop(This(ctx.owner.enclosingClass.asClass))
loop(start)
} catch {
case ex: ClassCastException =>
throw new ClassCastException(i"no path exists from ${ctx.owner.enclosingClass} to $toCls")
Expand Down
Loading