Fix polymorphic application for callback protocols #16514
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
This comment has been minimized.
This comment has been minimized.
AlexWaygood
reviewed
Nov 17, 2023
mypy/checkexpr.py
Outdated
Comment on lines
6212
to
6225
| def __init__( | ||
| self, | ||
| poly_tvars: Iterable[TypeVarLikeType], | ||
| bound_tvars: set[TypeVarLikeType] | None = None, | ||
| seen_aliases: set[TypeInfo] | None = None, | ||
| ) -> None: | ||
| self.poly_tvars = set(poly_tvars) | ||
| # This is a simplified version of TypeVarScope used during semantic analysis. | ||
| self.bound_tvars: set[TypeVarLikeType] = set() | ||
| self.seen_aliases: set[TypeInfo] = set() | ||
| if bound_tvars is None: | ||
| bound_tvars = set() | ||
| self.bound_tvars = bound_tvars | ||
| if seen_aliases is None: | ||
| seen_aliases = set() | ||
| self.seen_aliases = seen_aliases |
There was a problem hiding this comment.
You could possibly do this slightly more simply using frozensets:
--- a/mypy/checkexpr.py
+++ b/mypy/checkexpr.py
@@ -6212,16 +6212,12 @@ class PolyTranslator(TypeTranslator):
def __init__(
self,
poly_tvars: Iterable[TypeVarLikeType],
- bound_tvars: set[TypeVarLikeType] | None = None,
- seen_aliases: set[TypeInfo] | None = None,
+ bound_tvars: frozenset[TypeVarLikeType] = frozenset(),
+ seen_aliases: frozenset[TypeInfo] = frozenset(),
) -> None:
self.poly_tvars = set(poly_tvars)
# This is a simplified version of TypeVarScope used during semantic analysis.
- if bound_tvars is None:
- bound_tvars = set()
self.bound_tvars = bound_tvars
- if seen_aliases is None:
- seen_aliases = set()
self.seen_aliases = seen_aliasesThe regression test you added passes with this change
This comment has been minimized.
This comment has been minimized.
|
Diff from mypy_primer, showing the effect of this PR on open source code: anyio (https://github.com/agronholm/anyio): typechecking got 24133.51x faster (16.0s -> 0.0s)
(Performance measurements are based on a single noisy sample)
discord.py (https://github.com/Rapptz/discord.py): typechecking got 1.08x slower (176.3s -> 190.0s)
(Performance measurements are based on a single noisy sample)
|
JukkaL
pushed a commit
that referenced
this pull request
Nov 22, 2023
Fixes #16512 The problems were caused if same callback protocol appeared multiple times in a signature. Previous logic confused this with a recursive callback protocol.
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 #16512
The problems were caused if same callback protocol appeared multiple times in a signature. Previous logic confused this with a recursive callback protocol.