Fix #8501: Run closure adaptation in Erasure.etaExpand #8519
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
Erasure.Boxing.etaExpand generates closures, but did not run the same closure adaptation code used in Erasure#typedClosure which could lead to type mismatches at runtime when invoking it. Fixed by moving out the adaptation logic from Erasure#typedClosure into Erasure.Boxing.adaptClosure and reusing this in Erasure.Boxing.etaExpand. This fixes tests/run/context-functions.scala on Java 11. Also make sure ctx.typer is correctly set at Erasure (I'm surprised this didn't come up before), otherwise adaptClosure won't work.
smarter
force-pushed
the
adapt-shortcut-closure
branch
from
b63f878 to
d3c252d
Compare
|
Merging this now to get it in the next nightly but I"ll still take review comments into account. |
odersky
reviewed
Mar 12, 2020
| @@ -101,7 +101,7 @@ class Erasure extends Phase with DenotTransformer { | |||
|
|
|||
| def run(implicit ctx: Context): Unit = { | |||
| val unit = ctx.compilationUnit | |||
| unit.tpdTree = eraser.typedExpr(unit.tpdTree)(ctx.fresh.setPhase(this.next)) | |||
| unit.tpdTree = eraser.typedExpr(unit.tpdTree)(ctx.fresh.setTyper(eraser).setPhase(this.next)) | |||
There was a problem hiding this comment.
Amazing that this worked before. Or was typer set by other means?
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.
Erasure.Boxing.etaExpand generates closures, but did not run the same closure
adaptation code used in Erasure#typedClosure which could lead to
type mismatches at runtime when invoking it. Fixed by moving out the
adaptation logic from Erasure#typedClosure into
Erasure.Boxing.adaptClosure and reusing this in
Erasure.Boxing.etaExpand.
This fixes tests/run/context-functions.scala on Java 11.
Also make sure ctx.typer is correctly set at Erasure (I'm surprised this
didn't come up before), otherwise adaptClosure won't work.