Fixes for transitive inlining #11911
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
Partial fix for scala#11894
Inlined type arguments should be left alone in the inliner TreeTypeMap, analogous to inlined term arguments.
Break out an `InlinerMap` that contains inliner-specific overrides. This avoids a global mode in TreeTypeMap that had to deal with inliner-specific behavior.
odersky
changed the title
|
I think these are two important fixes that should still go into RC2 |
|
We should merge this before noon, so that we can cut the release. |
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.
Fixes #11894
Two classes of problems:
closureDefis too generalOptionapplication(2) only appeared for normal inlines, not for transparent inlines. I believe this has to do with the fact that recursive inlines are invoked in different order in the Typer and Inlining phases. In the typer it's during adapt in the Inline typer itself whereas in the inlining phase it is in
InliningTreeMapafter the first inline has been fully expanded. That makes a difference in that we see already all parameter bindings as regular code.