Fix lift try and captured vars interaction #758
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
|
Note: This PR uncovered (and fixes) a deeper problem about miniphase assembly which caused a |
odersky
force-pushed
the
fix-liftedTry-capturedVars-interaction
branch
from
2a5c446 to
5483088
Compare
It can happen that changeOwner sees symbols that are not defined yet at the phase where the method is run. Such symbols should be ignored.
There were two architectural errors here, which confused TreeTransforms and MiniPhases and which caused "NotDefinedHere" on transformFollowing: 1. TreeTransforms should not have idx fields, MiniPhases have them.2 2. TreeTransformers initialize arrays of MiniPhases not TreeTransforms.
CapturedVars introduced an assignment that could cause a try to be executed with a non-empty stack, even after LiftTry had already run. We now avoid this by introducing a temporary variable.
Checks the hypothesis that lifting a try may safely move expressions into a ValDef owned by a new temp var.
odersky
force-pushed
the
fix-liftedTry-capturedVars-interaction
branch
from
3c69bff to
4ff0636
Compare
|
@DarkDimius Can you take a look at what fails here? The PR tests OK locally, but it seems we run out of memory on jenkins. Edit: test commit passes, so it must be in the commits of this PR. Will investigate. |
|
/rebuild |
|
It was a spurious failure, after all. |
|
Otherwise LGTM |
installAfter now overwrites denotaton also when the first denotation of a symbol is defined after the current phase. Previously, a new denotation with a last valid phase before a first valid phase was created.
|
@DarkDimius Last two commits ready for review. |
|
LGTM |
DarkDimius
added a commit
that referenced
this pull request
Aug 20, 2015
…-interaction Fix lift try and captured vars interaction
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.
Replaces #753. Review by @DarkDimius.