Skip to content

[ty] Find legacy typevars using a TypeVisitor #19625

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

Closed
dcreager wants to merge 5 commits into from
Closed

[ty] Find legacy typevars using a TypeVisitor #19625

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
3dc636b
abort type visiting, recursion helper
dcreager Jul 29, 2025
e4a8404
impl type visitor for closures
dcreager Jul 29, 2025
659f898
find legacy typevars using a visitor
dcreager Jul 29, 2025
8f25f10
remove old find legacy method
dcreager Jul 29, 2025
11ee8fb
prune when finding legacy typevars
dcreager Jul 29, 2025
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
261 changes: 76 additions & 185 deletions crates/ty_python_semantic/src/types.rs
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 6 additions & 25 deletions crates/ty_python_semantic/src/types/class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ use crate::types::generics::{GenericContext, Specialization, walk_specialization
use crate::types::infer::nearest_enclosing_class;
use crate::types::signatures::{CallableSignature, Parameter, Parameters, Signature};
use crate::types::tuple::TupleType;
use crate::types::visitor::{TypeVisitor, TypeVisitorResult};
use crate::types::{
BareTypeAliasType, Binding, BoundSuperError, BoundSuperType, CallableType, DataclassParams,
DeprecatedInstance, DynamicType, KnownInstanceType, TypeAliasType, TypeMapping, TypeRelation,
TypeTransformer, TypeVarBoundOrConstraints, TypeVarInstance, TypeVarKind, declaration_type,
infer_definition_types,
};
use crate::{
Db, FxOrderSet, KnownModule, Program,
Db, KnownModule, Program,
module_resolver::file_to_module,
place::{
Boundness, LookupError, LookupResult, Place, PlaceAndQualifiers, class_symbol,
Expand Down Expand Up @@ -180,12 +181,13 @@ pub struct GenericAlias<'db> {
pub(crate) specialization: Specialization<'db>,
}

pub(super) fn walk_generic_alias<'db, V: super::visitor::TypeVisitor<'db> + ?Sized>(
pub(super) fn walk_generic_alias<'db, V: TypeVisitor<'db> + ?Sized>(
db: &'db dyn Db,
alias: GenericAlias<'db>,
visitor: &mut V,
) {
walk_specialization(db, alias.specialization(db), visitor);
) -> TypeVisitorResult {
walk_specialization(db, alias.specialization(db), visitor)?;
Ok(())
}

// The Salsa heap is tracked separately.
Expand Down Expand Up @@ -227,16 +229,6 @@ impl<'db> GenericAlias<'db> {
self.specialization(db).apply_type_mapping(db, type_mapping),
)
}

pub(super) fn find_legacy_typevars(
self,
db: &'db dyn Db,
typevars: &mut FxOrderSet<TypeVarInstance<'db>>,
) {
// A tuple's specialization will include all of its element types, so we don't need to also
// look in `self.tuple`.
self.specialization(db).find_legacy_typevars(db, typevars);
}
}

impl<'db> From<GenericAlias<'db>> for Type<'db> {
Expand Down Expand Up @@ -365,17 +357,6 @@ impl<'db> ClassType<'db> {
}
}

pub(super) fn find_legacy_typevars(
self,
db: &'db dyn Db,
typevars: &mut FxOrderSet<TypeVarInstance<'db>>,
) {
match self {
Self::NonGeneric(_) => {}
Self::Generic(generic) => generic.find_legacy_typevars(db, typevars),
}
}

/// Iterate over the [method resolution order] ("MRO") of the class.
///
/// If the MRO could not be accurately resolved, this method falls back to iterating
Expand Down
35 changes: 13 additions & 22 deletions crates/ty_python_semantic/src/types/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ use crate::types::diagnostic::{
use crate::types::generics::{GenericContext, walk_generic_context};
use crate::types::narrow::ClassInfoConstraintFunction;
use crate::types::signatures::{CallableSignature, Signature};
use crate::types::visitor::any_over_type;
use crate::types::visitor::{TypeVisitor, TypeVisitorResult, any_over_type};
use crate::types::{
BoundMethodType, CallableType, ClassLiteral, ClassType, DeprecatedInstance, DynamicType,
KnownClass, Truthiness, Type, TypeMapping, TypeRelation, TypeTransformer, TypeVarInstance,
UnionBuilder, walk_type_mapping,
KnownClass, Truthiness, Type, TypeMapping, TypeRelation, TypeTransformer, UnionBuilder,
walk_type_mapping,
};
use crate::{Db, FxOrderSet, ModuleName, resolve_module};
use crate::{Db, ModuleName, resolve_module};

/// A collection of useful spans for annotating functions.
///
Expand Down Expand Up @@ -429,14 +429,15 @@ pub struct FunctionLiteral<'db> {
inherited_generic_context: Option<GenericContext<'db>>,
}

fn walk_function_literal<'db, V: super::visitor::TypeVisitor<'db> + ?Sized>(
fn walk_function_literal<'db, V: TypeVisitor<'db> + ?Sized>(
db: &'db dyn Db,
function: FunctionLiteral<'db>,
visitor: &mut V,
) {
) -> TypeVisitorResult {
if let Some(context) = function.inherited_generic_context(db) {
walk_generic_context(db, context, visitor);
walk_generic_context(db, context, visitor)?;
}
Ok(())
}

#[salsa::tracked]
Expand Down Expand Up @@ -596,15 +597,16 @@ pub struct FunctionType<'db> {
// The Salsa heap is tracked separately.
impl get_size2::GetSize for FunctionType<'_> {}

pub(super) fn walk_function_type<'db, V: super::visitor::TypeVisitor<'db> + ?Sized>(
pub(super) fn walk_function_type<'db, V: TypeVisitor<'db> + ?Sized>(
db: &'db dyn Db,
function: FunctionType<'db>,
visitor: &mut V,
) {
walk_function_literal(db, function.literal(db), visitor);
) -> TypeVisitorResult {
walk_function_literal(db, function.literal(db), visitor)?;
for mapping in function.type_mappings(db) {
walk_type_mapping(db, mapping, visitor);
walk_type_mapping(db, mapping, visitor)?;
}
Ok(())
}

#[salsa::tracked]
Expand Down Expand Up @@ -854,17 +856,6 @@ impl<'db> FunctionType<'db> {
self_signature.is_equivalent_to(db, other_signature)
}

pub(crate) fn find_legacy_typevars(
self,
db: &'db dyn Db,
typevars: &mut FxOrderSet<TypeVarInstance<'db>>,
) {
let signatures = self.signature(db);
for signature in &signatures.overloads {
signature.find_legacy_typevars(db, typevars);
}
}

pub(crate) fn normalized(self, db: &'db dyn Db) -> Self {
let mut visitor = TypeTransformer::default();
self.normalized_impl(db, &mut visitor)
Expand Down
63 changes: 37 additions & 26 deletions crates/ty_python_semantic/src/types/generics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use crate::types::class_base::ClassBase;
use crate::types::instance::{NominalInstanceType, Protocol, ProtocolInstanceType};
use crate::types::signatures::{Parameter, Parameters, Signature};
use crate::types::tuple::{TupleSpec, TupleType};
use crate::types::visitor::{TypeVisitor, TypeVisitorControlFlow, TypeVisitorResult, visit_type};
use crate::types::{
KnownInstanceType, Type, TypeMapping, TypeRelation, TypeTransformer, TypeVarBoundOrConstraints,
TypeVarInstance, TypeVarVariance, UnionType, binding_type, declaration_type,
Expand Down Expand Up @@ -59,6 +60,23 @@ fn bound_legacy_typevars<'db>(
.filter(|typevar| typevar.is_legacy(db))
}

struct FindLegacyTypeVars<'a, 'db>(&'a mut FxOrderSet<TypeVarInstance<'db>>);

impl<'db> TypeVisitor<'db> for FindLegacyTypeVars<'_, 'db> {
fn visit_type(&mut self, db: &'db dyn Db, ty: Type<'db>) -> TypeVisitorResult {
match ty {
Type::TypeVar(typevar) => {
if typevar.is_legacy(db) {
self.0.insert(typevar);
}
Err(TypeVisitorControlFlow::Prune)
}
Type::KnownInstance(_) => Err(TypeVisitorControlFlow::Prune),
_ => Ok(()),
}
}
}

/// A list of formal type variables for a generic function, class, or type alias.
///
/// TODO: Handle nested generic contexts better, with actual parent links to the lexically
Expand All @@ -74,14 +92,15 @@ pub struct GenericContext<'db> {
pub(crate) variables: FxOrderSet<TypeVarInstance<'db>>,
}

pub(super) fn walk_generic_context<'db, V: super::visitor::TypeVisitor<'db> + ?Sized>(
pub(super) fn walk_generic_context<'db, V: TypeVisitor<'db> + ?Sized>(
db: &'db dyn Db,
context: GenericContext<'db>,
visitor: &mut V,
) {
) -> TypeVisitorResult {
for typevar in context.variables(db) {
visitor.visit_type_var_type(db, *typevar);
visitor.visit_type_var_type(db, *typevar)?;
}
Ok(())
}

// The Salsa heap is tracked separately.
Expand Down Expand Up @@ -134,14 +153,14 @@ impl<'db> GenericContext<'db> {
let mut variables = FxOrderSet::default();
for param in parameters {
if let Some(ty) = param.annotated_type() {
ty.find_legacy_typevars(db, &mut variables);
visit_type(db, ty, FindLegacyTypeVars(&mut variables));
}
if let Some(ty) = param.default_type() {
ty.find_legacy_typevars(db, &mut variables);
visit_type(db, ty, FindLegacyTypeVars(&mut variables));
}
}
if let Some(ty) = return_type {
ty.find_legacy_typevars(db, &mut variables);
visit_type(db, ty, FindLegacyTypeVars(&mut variables));
}

// Then remove any that were bound in enclosing scopes.
Expand All @@ -167,7 +186,7 @@ impl<'db> GenericContext<'db> {
) -> Option<Self> {
let mut variables = FxOrderSet::default();
for base in bases {
base.find_legacy_typevars(db, &mut variables);
visit_type(db, base, FindLegacyTypeVars(&mut variables));
}
if variables.is_empty() {
return None;
Expand Down Expand Up @@ -359,18 +378,19 @@ pub struct Specialization<'db> {
tuple_inner: Option<TupleType<'db>>,
}

pub(super) fn walk_specialization<'db, V: super::visitor::TypeVisitor<'db> + ?Sized>(
pub(super) fn walk_specialization<'db, V: TypeVisitor<'db> + ?Sized>(
db: &'db dyn Db,
specialization: Specialization<'db>,
visitor: &mut V,
) {
walk_generic_context(db, specialization.generic_context(db), visitor);
) -> TypeVisitorResult {
walk_generic_context(db, specialization.generic_context(db), visitor)?;
for ty in specialization.types(db) {
visitor.visit_type(db, *ty);
visitor.visit_type(db, *ty)?;
}
if let Some(tuple) = specialization.tuple_inner(db) {
visitor.visit_tuple_type(db, tuple);
visitor.visit_tuple_type(db, tuple)?;
}
Ok(())
}

impl<'db> Specialization<'db> {
Expand Down Expand Up @@ -594,16 +614,6 @@ impl<'db> Specialization<'db> {

true
}

pub(crate) fn find_legacy_typevars(
self,
db: &'db dyn Db,
typevars: &mut FxOrderSet<TypeVarInstance<'db>>,
) {
for ty in self.types(db) {
ty.find_legacy_typevars(db, typevars);
}
}
}

/// A mapping between type variables and types.
Expand All @@ -616,15 +626,16 @@ pub struct PartialSpecialization<'a, 'db> {
types: Cow<'a, [Type<'db>]>,
}

pub(super) fn walk_partial_specialization<'db, V: super::visitor::TypeVisitor<'db> + ?Sized>(
pub(super) fn walk_partial_specialization<'db, V: TypeVisitor<'db> + ?Sized>(
db: &'db dyn Db,
specialization: &PartialSpecialization<'_, 'db>,
visitor: &mut V,
) {
walk_generic_context(db, specialization.generic_context, visitor);
) -> TypeVisitorResult {
walk_generic_context(db, specialization.generic_context, visitor)?;
for ty in &*specialization.types {
visitor.visit_type(db, *ty);
visitor.visit_type(db, *ty)?;
}
Ok(())
}

impl<'db> PartialSpecialization<'_, 'db> {
Expand Down
Loading
Loading