Refactor constant folding of applications #20099
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
Move them in typedApply/typedTypeApply instead of leaving them until adapt. This aligns these folds with folds of uniary operations, which are done already in typedSelect and avoids potentially several calls to ConstFold when arguments are passed to overloaded methods.
odersky
force-pushed
the
refactor-constfold
branch
from
5167ce3 to
235c047
Compare
There was a problem hiding this comment.
I believe the ConstFold in TypeAssigner could now also be removed
scala3/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala
Lines 314 to 316 in 521ce95
Otherwise looks good to me !
|
Not sure about the TypeAssigner one. Directly constructed TypeApply don't go through Applications, so we would stop constant folding them. |
| @@ -1189,7 +1190,8 @@ trait Applications extends Compatibility { | |||
| case _ => tree.withType(TryDynamicCallType) | |||
| } | |||
| if (typedFn.tpe eq TryDynamicCallType) tryDynamicTypeApply() | |||
| else assignType(cpy.TypeApply(tree)(typedFn, typedArgs), typedFn, typedArgs) | |||
| else | |||
| ConstFold(assignType(cpy.TypeApply(tree)(typedFn, typedArgs), typedFn, typedArgs)) | |||
There was a problem hiding this comment.
But do we need this one then ? I'm confused about why we need both of them.
There was a problem hiding this comment.
Good point. We don't need the one here.
EugeneFlesselle
approved these changes
Apr 8, 2024
WojciechMazur
added a commit
that referenced
this pull request
Jul 5, 2024
Backports #20099 to the LTS branch. PR submitted by the release tooling. [skip ci]
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.
Move them in typedApply/typedTypeApply instead of leaving them until adapt. This aligns these folds with folds of unary operations, which are done already in typedSelect and avoids potentially several calls to ConstFold when arguments are passed to overloaded methods.