-
-
Notifications
You must be signed in to change notification settings - Fork 3k
[mypyc] feat: implement try_getting_literal in in
rtuple helper [1/1]
#20032
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
Draft
BobTheBuidler
wants to merge
4
commits into
python:master
Choose a base branch
from
BobTheBuidler:patch-17
base: master
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.
Draft
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
638d489
[mypyc] feat: implement try_getting_literal in `in` rtuple helper [1/1]
BobTheBuidler afe5f2f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 2a961fd
Update expression.py
BobTheBuidler fa21d27
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 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 |
---|---|---|
|
@@ -10,6 +10,7 @@ | |
from collections.abc import Sequence | ||
from typing import Callable | ||
|
||
from mypy.checkexpr import try_getting_literal | ||
from mypy.nodes import ( | ||
ARG_NAMED, | ||
ARG_POS, | ||
|
@@ -50,7 +51,7 @@ | |
UnaryExpr, | ||
Var, | ||
) | ||
from mypy.types import Instance, ProperType, TupleType, TypeType, get_proper_type | ||
from mypy.types import Instance, LiteralType, ProperType, TupleType, TypeType, get_proper_type | ||
from mypyc.common import MAX_SHORT_INT | ||
from mypyc.ir.class_ir import ClassIR | ||
from mypyc.ir.func_ir import FUNC_CLASSMETHOD, FUNC_STATICMETHOD | ||
|
@@ -784,9 +785,26 @@ def try_specialize_in_expr( | |
items = [builder.accept(item) for item in rhs.items] | ||
elif isinstance(builder.node_type(rhs), RTuple): | ||
left = builder.accept(lhs) | ||
tuple_val = builder.accept(rhs) | ||
assert isinstance(tuple_val.type, RTuple) | ||
items = [builder.add(TupleGet(tuple_val, i)) for i in range(len(tuple_val.type.types))] | ||
proper_type = get_proper_type(builder.types[rhs]) | ||
assert isinstance(proper_type, TupleType) | ||
literal_items = list(map(try_getting_literal, proper_type.items)) | ||
if None not in literal_items: | ||
# If all tuple items are literals we don't even need to accept the tuple | ||
# TODO: should we use object_rprimitive? prob not, what do? | ||
items = [LoadLiteral(literal.value, object_rprimitive) for literal in literal_items] | ||
else: | ||
tuple_val = builder.accept(rhs) | ||
assert isinstance(tuple_val.type, RTuple) | ||
proper_type = get_proper_type(builder.types[rhs]) | ||
items = [ | ||
# TODO: should we use object_rprimitive? prob not, what do? | ||
( | ||
LoadLiteral(typ.value, object_rprimitive) | ||
if isinstance(typ, LiteralType) | ||
else builder.add(TupleGet(tuple_val, i)) | ||
) | ||
for i, typ in enumerate(map(try_getting_literal, proper_type.items)) | ||
] | ||
|
||
if items is not None: | ||
assert left is not None | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wonder if it would be worth weaving the item-getting process into the equality checks so in some cases we can exit early without fully loading the tuple items |
||
|
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.
if all items are literals we can probably have a fast-false path via type check, and if the type check passes the subsequent equality checks will be much faster