[Constraint solver] Shore up "common return type" optimization. #9494
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
The "common return type" optimization that occurs at constraint-generation time was overly complicated and wrong in a couple of places. Fix up these issues: * Don't cache information about this optimization in the decls themselves; it ignores visibility as well as invalidation that occurs in script mode and playgrounds. Just do the the work again * Don't map type into context; we can bail out when there are type parameters present * Skip the "self" parameters of operators in types (since this only ever occurs for operators). Longer term, this optimization should move into the solver itself. But for now, at least it's cleaner/more correct.
|
@swift-ci please smoke test and merge |
|
@swift-ci please smoke test |
DougGregor
force-pushed
the
common-return-type-cleanup
branch
from
a0403ee to
d98ae72
Compare
|
It's gonna fail. Sigh |
|
@swift-ci please smoke test |
|
Second commit fixed some crashers. |
…cker. When errors occur in the processing of expressions, we can end up with invalid ASTs where the application of an operator declared within a type is missing its "self" argument. Tolerate such ASTs in the error-handling checker.
The "skip generic operators" heuristic within the constraint solver is fairly awful, because it is known to miss reasonable solutions. Make is slightly more narrow by only skipping generic operators when the concrete operator we found was symmetric.
DougGregor
force-pushed
the
common-return-type-cleanup
branch
from
d98ae72 to
badffdc
Compare
|
@swift-ci please smoke test and merge |
1 similar comment
|
@swift-ci please smoke test and merge |
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.
The "common return type" optimization that occurs at
constraint-generation time was overly complicated and wrong in a
couple of places. Fix up these issues:
themselves; it ignores visibility as well as invalidation that
occurs in script mode and playgrounds. Just do the the work again
parameters present
ever occurs for operators).
Longer term, this optimization should move into the solver itself. But
for now, at least it's cleaner/more correct.