Improve result of bridge in delambdafy #10831
Merged
+36
−9
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
d871494
to
01a1f69
Compare
lrytz
reviewed
Aug 22, 2024
| @@ -244,7 +254,7 @@ abstract class Delambdafy extends Transform with TypingTransformers with ast.Tre | |||
| } | |||
|
|
|||
| val bridge = postErasure.newTransformer(unit).transform(DefDef(methSym, List(bridgeParams.map(ValDef(_))), | |||
| adaptToType(forwarderCall setType functionResultType, bridgeResultType))).asInstanceOf[DefDef] | |||
| adaptToType(forwarderCall.setType(forwarderType), bridgeResultType))).asInstanceOf[DefDef] | |||
There was a problem hiding this comment.
IIUC the issue you're addressing is the same (in opposite direction) as the one addressed 10 lines above for arguments. I like that this existing fix is more local.
Could we do this instead?
val forwarderActualType =
if (samResultType.isInstanceOf[ErasedValueType] && functionResultType.isInstanceOf[ErasedValueType]) bridgeResultType
else functionResultTypeand then
Suggested change
| adaptToType(forwarderCall.setType(forwarderType), bridgeResultType))).asInstanceOf[DefDef] | |
| adaptToType(forwarderCall.setType(forwarderActualType), bridgeResultType))).asInstanceOf[DefDef] |
There was a problem hiding this comment.
Yes, I didn't simplify the expression.
01a1f69
to
09e01ab
Compare
lrytz
approved these changes
Aug 23, 2024
Co-authored-by: Lukas Rytz <lukas.rytz@gmail.com>
09e01ab
to
76d095f
Compare
|
Rebased and removed debug option in test. |
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 scala/bug#13022