Handle Java varargs T... where T is a class parameter
#13718
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
smarter
force-pushed
the
java-varargs-erasure-3
branch
2 times, most recently
from
9ccc78a
to
324e3ec
Compare
odersky
approved these changes
Oct 8, 2021
| @@ -145,7 +130,7 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase => | |||
| val tpe = arg.expr.tpe | |||
| if isJavaDefined then | |||
| val pt = tree.fun.tpe.widen.firstParamTypes.last | |||
There was a problem hiding this comment.
This definition is not used
Suggested change
| val pt = tree.fun.tpe.widen.firstParamTypes.last |
Previously, ElimRepeated correctly handled Java varargs of the form `Object...` and `T...` where `T` is a method parameter, in both cases we erased them to `Array[? <: Object]` in the denotation transformer and handled any adaptation in the tree transformer of ElimRepeated. Unfortunately, the denotation transformer logic failed to account for class type parameters, and fixing it introduced issues in override checking (RefChecks happens after ElimRepeated). So this commit gives up and delay the adaptation of primitive arrays into reference arrays until Erasure. This is less efficient in some situations but is closer to what Scala 2 does so hopefully means we won't run into more pitfalls. Fixes scala#13645.
smarter
force-pushed
the
java-varargs-erasure-3
branch
from
324e3ec
to
6e35c6f
Compare
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.
Previously, ElimRepeated correctly handled Java varargs of the
form
Object...andT...whereTis a method parameter, in bothcases we erased them to
Array[? <: Object]in the denotationtransformer and handled any adaptation in the tree transformer of
ElimRepeated.
Unfortunately, the denotation transformer logic failed to account for
class type parameters, and fixing it introduced issues in override
checking (RefChecks happens after ElimRepeated). So this commit gives up
and delay the adaptation of primitive arrays into reference arrays until
Erasure. This is less efficient in some situations but is closer to what
Scala 2 does so hopefully means we won't run into more pitfalls.
Fixes #13645.