Fix #9457 and #9626: Remove TermRef to inline parameters #9800
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
For inline parameters we do not need to reeplace the parameter TermRef with the proxy TermRef as this one will immediately be removed.
This was
linked to
issues
Sep 15, 2020
nicolasstucki
requested review from
odersky and
liufengyun
and removed request for
odersky
liufengyun
approved these changes
Sep 15, 2020
| @@ -673,7 +673,9 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { | |||
| def apply(t: Type) = t match { | |||
| case t: ThisType => thisProxy.getOrElse(t.cls, t) | |||
| case t: TypeRef => paramProxy.getOrElse(t, mapOver(t)) | |||
| case t: SingletonType => paramProxy.getOrElse(t, mapOver(t)) | |||
| case t: SingletonType => | |||
| if t.termSymbol.isAllOf(Inline | Param) then mapOver(t.widenTermRefExpr) | |||
There was a problem hiding this comment.
What about use a case specifically for TermRef:
case t @ TermRef(NoPrefix, _) if t.termSymbol.isAllOf(Inline | Param) =>
mapOver(t.widenTermRefExpr)
case t: SingletonType =>
paramProxy.getOrElse(t, mapOver(t))There was a problem hiding this comment.
That was my original code but den I redactores it to avoid the unnecessary extra type test.
nicolasstucki
deleted the
fix-missing-widening-of-inline-param-termrefs
branch
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.
For inline parameters we do not need to reeplace the parameter TermRef
with the proxy TermRef as this one will immediately be removed.