-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Try to instantiate TypeVars inside pt when possible
#24231
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
noti0na1
wants to merge
4
commits into
scala:main
Choose a base branch
from
dotty-staging:fix-function-type-inference-in-union
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+76
−10
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
584c069
Try to instantiate `pt` if this is possible by looking into union/int…
noti0na1 d93ed6c
Refactor type instantiation logic when typing function values to hand…
noti0na1 19cec83
Update comments; add test cases for function type inference with unio…
noti0na1 8840779
Try to only instantiate one type variable bounded function types
noti0na1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -1921,15 +1921,39 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer | |||||||||||||||
| NoType | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
| pt match { | ||||||||||||||||
| case pt: TypeVar | ||||||||||||||||
| if untpd.isFunctionWithUnknownParamType(tree) && !calleeType.exists => | ||||||||||||||||
| // try to instantiate `pt` if this is possible. If it does not | ||||||||||||||||
| // work the error will be reported later in `inferredParam`, | ||||||||||||||||
| // when we try to infer the parameter type. | ||||||||||||||||
| isFullyDefined(pt, ForceDegree.flipBottom) | ||||||||||||||||
| case _ => | ||||||||||||||||
| } | ||||||||||||||||
| /** Try to instantiate one type variable bounded by function types that appear | ||||||||||||||||
| * deeply inside `tp`, including union or intersection types. | ||||||||||||||||
| */ | ||||||||||||||||
| def tryToInstantiateDeeply(tp: Type): Boolean = tp match | ||||||||||||||||
| case tp: AndOrType => | ||||||||||||||||
| tryToInstantiateDeeply(tp.tp1) | ||||||||||||||||
| || tryToInstantiateDeeply(tp.tp2) | ||||||||||||||||
| case tp: FlexibleType => | ||||||||||||||||
| tryToInstantiateDeeply(tp.hi) | ||||||||||||||||
| case tp: TypeVar if isConstrainedByFunctionType(tp) => | ||||||||||||||||
| // Only instantiate if the type variable is constrained by function types | ||||||||||||||||
| isFullyDefined(tp, ForceDegree.flipBottom) | ||||||||||||||||
| case _ => false | ||||||||||||||||
|
|
||||||||||||||||
|
||||||||||||||||
| /** Determines whether the bounds (lower or upper) of the given type variable | |
| * contain function types or SAM types. This is used to decide whether the type | |
| * variable should be instantiated to assist with parameter type inference. | |
| * The check is performed recursively, traversing union, intersection, and flexible types. | |
| */ |
noti0na1 marked this conversation as resolved.
Show resolved
Hide resolved
noti0na1 marked this conversation as resolved.
Show resolved
Hide resolved
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
|
|
||
| def f[T](x: T): T = ??? | ||
| def f2[T](x: T | T): T = ??? | ||
| def f3[T](x: T | Null): T = ??? | ||
| def f4[T](x: Int | T): T = ??? | ||
|
|
||
| trait MyOption[+T] | ||
|
|
||
| object MyOption: | ||
| def apply[T](x: T | Null): MyOption[T] = ??? | ||
|
|
||
| def test = | ||
| val g: AnyRef => Boolean = f { | ||
| x => x eq null // ok | ||
| } | ||
| val g2: AnyRef => Boolean = f2 { | ||
| x => x eq null // ok | ||
| } | ||
| val g3: AnyRef => Boolean = f3 { | ||
| x => x eq null // was error | ||
| } | ||
| val g4: AnyRef => Boolean = f4 { | ||
| x => x eq null // was error | ||
| } | ||
|
|
||
| val o1: MyOption[String] = MyOption(null) | ||
| val o2: MyOption[String => Boolean] = MyOption { | ||
| x => x.length > 0 | ||
| } | ||
| val o3: MyOption[(String, String) => Boolean] = MyOption { | ||
| (x, y) => x.length > y.length | ||
| } | ||
|
|
||
|
|
||
| class Box[T] | ||
| val box: Box[Unit] = ??? | ||
| def ff1[T, U](x: T | U, y: Box[U]): T = ??? | ||
| def ff2[T, U](x: T & U): T = ??? | ||
|
|
||
| def test2 = | ||
| val a1: Any => Any = ff1(x => x, box) | ||
| val a2: Any => Any = ff2(x => x) |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The logical OR operator (||) will short-circuit and skip checking
tp.tp2iftp.tp1succeeds. This means if both sides contain type variables that need instantiation, only the first will be instantiated. Consider using bitwise OR (|) or explicitly calling both sides to ensure all nested type variables are instantiated.