diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
index 24f0c8c85d61..86f8d9410476 100644
--- a/mypy/checkexpr.py
+++ b/mypy/checkexpr.py
@@ -1755,14 +1755,6 @@ def check_callable_call(
return AnyType(TypeOfAny.from_error), callee
seen_unpack = True
- formal_to_actual = map_actuals_to_formals(
- arg_kinds,
- arg_names,
- callee.arg_kinds,
- callee.arg_names,
- lambda i: self.accept(args[i]),
- )
-
# This is tricky: return type may contain its own type variables, like in
# def [S] (S) -> def [T] (T) -> tuple[S, T], so we need to update their ids
# to avoid possible id clashes if this call itself appears in a generic
@@ -1773,27 +1765,29 @@ def check_callable_call(
freeze_all_type_vars(fresh_ret_type)
callee = callee.copy_modified(ret_type=fresh_ret_type)
+ if callee.is_generic():
+ callee = freshen_function_type_vars(callee)
+ callee = self.infer_function_type_arguments_using_context(callee, context)
+
+ formal_to_actual = map_actuals_to_formals(
+ arg_kinds,
+ arg_names,
+ callee.arg_kinds,
+ callee.arg_names,
+ lambda i: self.accept(args[i]),
+ )
+
if callee.is_generic():
need_refresh = any(
isinstance(v, (ParamSpecType, TypeVarTupleType)) for v in callee.variables
)
- callee = freshen_function_type_vars(callee)
- callee = self.infer_function_type_arguments_using_context(callee, context)
- if need_refresh:
- # Argument kinds etc. may have changed due to
- # ParamSpec or TypeVarTuple variables being replaced with an arbitrary
- # number of arguments; recalculate actual-to-formal map
- formal_to_actual = map_actuals_to_formals(
- arg_kinds,
- arg_names,
- callee.arg_kinds,
- callee.arg_names,
- lambda i: self.accept(args[i]),
- )
callee = self.infer_function_type_arguments(
callee, args, arg_kinds, arg_names, formal_to_actual, need_refresh, context
)
if need_refresh:
+ # Argument kinds etc. may have changed due to
+ # ParamSpec or TypeVarTuple variables being replaced with an arbitrary
+ # number of arguments; recalculate actual-to-formal map
formal_to_actual = map_actuals_to_formals(
arg_kinds,
arg_names,
@@ -2258,6 +2252,11 @@ def infer_function_type_arguments_pass2(
if isinstance(arg, (NoneType, UninhabitedType)) or has_erased_component(arg):
inferred_args[i] = None
callee_type = self.apply_generic_arguments(callee_type, inferred_args, context)
+
+ if not callee_type.is_generic():
+ # Fast path, second pass can't give new information.
+ return callee_type, []
+
if need_refresh:
formal_to_actual = map_actuals_to_formals(
arg_kinds,
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy