Skip to content
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.

Sign up for GitHub

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

Optimization: Avoid a few uses of contextmanagers in semantic analyzer #14360

Merged
merged 1 commit into from
Dec 28, 2022
Merged

Optimization: Avoid a few uses of contextmanagers in semantic analyzer #14360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

from __future__ import annotations

from contextlib import contextmanager, nullcontext
from contextlib import contextmanager
from typing import Any, Callable, Collection, Iterable, Iterator, List, TypeVar, cast
from typing_extensions import Final, TypeAlias as _TypeAlias

Expand Down Expand Up @@ -2645,11 +2645,15 @@ def visit_assignment_stmt(self, s: AssignmentStmt) -> None:
# But we can't use a full visit because it may emit extra incomplete refs (namely
# when analysing any type applications there) thus preventing the further analysis.
# To break the tie, we first analyse rvalue partially, if it can be a type alias.
with self.basic_type_applications_set(s):
with self.allow_unbound_tvars_set() if self.can_possibly_be_index_alias(
s
) else nullcontext():
if self.can_possibly_be_index_alias(s):
old_basic_type_applications = self.basic_type_applications
self.basic_type_applications = True
with self.allow_unbound_tvars_set():
s.rvalue.accept(self)
self.basic_type_applications = old_basic_type_applications
else:
s.rvalue.accept(self)

if self.found_incomplete_ref(tag) or self.should_wait_rhs(s.rvalue):
# Initializer couldn't be fully analyzed. Defer the current node and give up.
# Make sure that if we skip the definition of some local names, they can't be
Expand Down Expand Up @@ -2819,17 +2823,6 @@ def can_possibly_be_index_alias(self, s: AssignmentStmt) -> bool:
# Something that looks like Foo = Bar[Baz, ...]
return True

@contextmanager
def basic_type_applications_set(self, s: AssignmentStmt) -> Iterator[None]:
old = self.basic_type_applications
# As an optimization, only use the double visit logic if this
# can possibly be a recursive type alias.
self.basic_type_applications = self.can_possibly_be_index_alias(s)
try:
yield
finally:
self.basic_type_applications = old

def is_type_ref(self, rv: Expression, bare: bool = False) -> bool:
"""Does this expression refer to a type?

Expand Down