Skip to content

errors: speedup for large error counts #12631

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

Merged
merged 5 commits into from
Apr 29, 2022
Merged

errors: speedup for large error counts #12631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d36a8f3
errors: speedup for large error counts
hugues-aff Apr 20, 2022
425b9f1
address comments
hugues-aff Apr 21, 2022
03b02f8
errors: unify and optimize error filtering
hugues-aff Apr 25, 2022
bab5a3a
Update mypy/errors.py
JelleZijlstra Apr 29, 2022
f40d0eb
Update mypy/errors.py
JelleZijlstra Apr 29, 2022
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
51 changes: 23 additions & 28 deletions mypy/checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2196,7 +2196,7 @@ def is_raising_or_empty(self, s: Statement) -> bool:
if isinstance(s.expr, EllipsisExpr):
return True
elif isinstance(s.expr, CallExpr):
with self.expr_checker.msg.disable_errors():
with self.expr_checker.msg.filter_errors():
typ = get_proper_type(self.expr_checker.accept(
s.expr, allow_none_return=True, always_allow_any=True))

Expand Down Expand Up @@ -3377,7 +3377,7 @@ def check_member_assignment(self, instance_type: Type, attribute_type: Type,
# For non-overloaded setters, the result should be type-checked like a regular assignment.
# Hence, we first only try to infer the type by using the rvalue as type context.
type_context = rvalue
with self.msg.disable_errors():
with self.msg.filter_errors():
_, inferred_dunder_set_type = self.expr_checker.check_call(
dunder_set_type,
[TempNode(instance_type, context=context), type_context],
Expand Down Expand Up @@ -4312,34 +4312,29 @@ def _make_fake_typeinfo_and_full_name(
)
return info_, full_name_

old_msg = self.msg
new_msg = old_msg.clean_copy()
self.msg = new_msg
base_classes = _get_base_classes(instances)
# We use the pretty_names_list for error messages but can't
# use it for the real name that goes into the symbol table
# because it can have dots in it.
pretty_names_list = pretty_seq(format_type_distinctly(*base_classes, bare=True), "and")
try:
info, full_name = _make_fake_typeinfo_and_full_name(base_classes, curr_module)
self.check_multiple_inheritance(info)
if new_msg.is_errors():
with self.msg.filter_errors() as local_errors:
self.check_multiple_inheritance(info)
if local_errors.has_new_errors():
# "class A(B, C)" unsafe, now check "class A(C, B)":
new_msg = new_msg.clean_copy()
self.msg = new_msg
base_classes = _get_base_classes(instances[::-1])
info, full_name = _make_fake_typeinfo_and_full_name(base_classes, curr_module)
self.check_multiple_inheritance(info)
with self.msg.filter_errors() as local_errors:
self.check_multiple_inheritance(info)
info.is_intersection = True
except MroError:
if self.should_report_unreachable_issues():
old_msg.impossible_intersection(
self.msg.impossible_intersection(
pretty_names_list, "inconsistent method resolution order", ctx)
return None
finally:
self.msg = old_msg

if new_msg.is_errors():
if local_errors.has_new_errors():
if self.should_report_unreachable_issues():
self.msg.impossible_intersection(
pretty_names_list, "incompatible method signatures", ctx)
Expand Down Expand Up @@ -4974,20 +4969,20 @@ def refine_parent_types(self,
member_name = expr.name

def replay_lookup(new_parent_type: ProperType) -> Optional[Type]:
msg_copy = self.msg.clean_copy()
member_type = analyze_member_access(
name=member_name,
typ=new_parent_type,
context=parent_expr,
is_lvalue=False,
is_super=False,
is_operator=False,
msg=msg_copy,
original_type=new_parent_type,
chk=self,
in_literal_context=False,
)
if msg_copy.is_errors():
with self.msg.filter_errors() as w:
member_type = analyze_member_access(
name=member_name,
typ=new_parent_type,
context=parent_expr,
is_lvalue=False,
is_super=False,
is_operator=False,
msg=self.msg,
original_type=new_parent_type,
chk=self,
in_literal_context=False,
)
if w.has_new_errors():
return None
else:
return member_type
Expand Down
Loading