Skip to content

Fix #1865: Compute outer path at right phase #1873

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

Merged
merged 2 commits into from
Jan 5, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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/transform/ExplicitOuter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ object ExplicitOuter {
if (tpe.prefix eq NoPrefix) cls.owner.enclosingClass.thisType
else tpe.prefix
case _ =>
outerPrefix(tpe.underlying)
outerPrefix(tpe.underlying(ctx.withPhaseNoLater(ctx.erasurePhase)))
Copy link
Member

Choose a reason for hiding this comment

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

Since this is somewhat subtle, I would add a comment here that restates what is in the commit message.

}
case tpe: TypeProxy =>
outerPrefix(tpe.underlying)
Expand Down Expand Up @@ -339,6 +339,7 @@ object ExplicitOuter {
val cls = fun.symbol.owner.asClass
def outerArg(receiver: Tree): Tree = receiver match {
case New(_) | Super(_, _) =>
println(i"outerarg: ${receiver.tpe} --> ${outerPrefix(receiver.tpe)} at ${ctx.phase}")
Copy link
Member

Choose a reason for hiding this comment

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

stray println

singleton(fixThis(outerPrefix(receiver.tpe)))
case This(_) =>
ref(outerParamAccessor(cls)) // will be rewired to outer argument of secondary constructor in phase Constructors
Expand Down
24 changes: 24 additions & 0 deletions tests/pending/pos/i1865.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
class AbsCell {
Copy link
Member

Choose a reason for hiding this comment

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

This test is in tests/pending/ so we're not actually running it

type T = Node
class Node
}

object Test {
def test: Unit = {
val cell = new AbsCell
new cell.T
}
}

class AbsCell2 {
type T = Node
val value: T = value
def set(x: T): Unit = {}
class Node
}
object init {
def main = {
val cell = new AbsCell2 { val init = new Node }
cell set (new cell.T)
}
}