Fix #1865: Compute outer path at right phase #1873
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When computing the outer path, we need to be careful to dealias before erasure, even if the outer path is demanded during erasure. Otherwise we lose prefixes.
smarter
reviewed
Jan 3, 2017
| @@ -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))) | |||
There was a problem hiding this comment.
Since this is somewhat subtle, I would add a comment here that restates what is in the commit message.
| @@ -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}") | |||
| @@ -0,0 +1,24 @@ | |||
| class AbsCell { | |||
There was a problem hiding this comment.
This test is in tests/pending/ so we're not actually running it
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When computing the outer path, we need to be careful to dealias before erasure,
even if the outer path is demanded during erasure. Otherwise we lose prefixes.
Review by @DarkDimius ?