Fix mapping TypeMaps over annotations #15948
Merged
Conversation
This file contains 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
Avoids orphan parameters when pickling Fixes scala#15922 I am not sure about the status of the test in custome-args/captures. Should it pass or be rejected? But in any case it does not crash anymore.
odersky
commented
Sep 1, 2022
| @@ -58,7 +59,7 @@ object Annotations { | |||
| if tm.isRange(x) then x | |||
| else | |||
| val tp1 = tm(tree.tpe) | |||
| foldOver(if tp1 =:= tree.tpe then x else tp1, tree) | |||
| foldOver(if tp1 frozen_=:= tree.tpe then x else tp1, tree) | |||
There was a problem hiding this comment.
The change that fixed the test case was this one.
|
What is the test in |
|
I meant pos-customargs/captures |
dwijnand
reviewed
Sep 2, 2022
| @@ -19,6 +19,7 @@ i6507b.scala | |||
| i12299a.scala | |||
| i13871.scala | |||
| i15181.scala | |||
| i15922.scala | |||
There was a problem hiding this comment.
I did not have the time to follow up on this.
Yes it should be accepted. Although it was taken from a negative example, it does not include the line of code that really should be rejected (the line that actually uses the boxed capability). |
|
Maybe let's merge this PR first and open an issue to follow up the pickling failure of |
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.
Avoids orphan parameters when pickling
Fixes #15922
I am not sure about the status of the test in custome-args/captures. Should it
pass or be rejected? But in any case it does not crash anymore.