Skip to content

[red-knot] Reduce Salsa lookups in Type::find_name_in_mro #16582

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 1 commit into from
Mar 10, 2025
Merged

[red-knot] Reduce Salsa lookups in Type::find_name_in_mro #16582

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
58 changes: 28 additions & 30 deletions crates/red_knot_python_semantic/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,42 +1457,39 @@ impl<'db> Type<'db> {

Type::Dynamic(_) | Type::Never => Some(Symbol::bound(self).into()),

Type::ClassLiteral(ClassLiteralType { class })
if class.is_known(db, KnownClass::FunctionType) && name == "__get__" =>
{
Some(Symbol::bound(Type::Callable(CallableType::WrapperDescriptorDunderGet)).into())
}
Type::ClassLiteral(ClassLiteralType { class })
if class.is_known(db, KnownClass::FunctionType)
&& matches!(name, "__set__" | "__delete__") =>
{
// Hard code this knowledge, as we look up `__set__` and `__delete__` on `FunctionType` often.
Some(Symbol::Unbound.into())
}
// TODO:
// We currently hard-code the knowledge that the following known classes are not
// descriptors, i.e. that they have no `__get__` method. This is not wrong and
// potentially even beneficial for performance, but it's not very principled.
// This case can probably be removed eventually, but we include it at the moment
// because we make extensive use of these types in our test suite. Note that some
// builtin types are not included here, since they do not have generic bases and
// are correctly handled by the `find_name_in_mro` method.
Type::ClassLiteral(class)
if matches!(
class.class.known(db),
Some(
KnownClass::Int
Type::ClassLiteral(class_literal @ ClassLiteralType { class }) => {
match (class.known(db), name) {
(Some(KnownClass::FunctionType), "__get__") => Some(
Symbol::bound(Type::Callable(CallableType::WrapperDescriptorDunderGet))
.into(),
),
(Some(KnownClass::FunctionType), "__set__" | "__delete__") => {
// Hard code this knowledge, as we look up `__set__` and `__delete__` on `FunctionType` often.
Some(Symbol::Unbound.into())
}
// TODO:
// We currently hard-code the knowledge that the following known classes are not
// descriptors, i.e. that they have no `__get__` method. This is not wrong and
// potentially even beneficial for performance, but it's not very principled.
// This case can probably be removed eventually, but we include it at the moment
// because we make extensive use of these types in our test suite. Note that some
// builtin types are not included here, since they do not have generic bases and
// are correctly handled by the `find_name_in_mro` method.
(
Some(
KnownClass::Int
| KnownClass::Str
| KnownClass::Bytes
| KnownClass::Tuple
| KnownClass::Slice
| KnownClass::Range,
)
) && matches!(name, "__get__" | "__set__" | "__delete__") =>
{
Some(Symbol::Unbound.into())
),
"__get__" | "__set__" | "__delete__",
) => Some(Symbol::Unbound.into()),

_ => Some(class_literal.class_member(db, name)),
}
}
Type::ClassLiteral(class_literal) => Some(class_literal.class_member(db, name)),

Type::SubclassOf(subclass_of)
if name == "__get__"
Expand Down Expand Up @@ -1523,6 +1520,7 @@ impl<'db> Type<'db> {
.to_class_literal(db)
.find_name_in_mro(db, name)
}

Type::FunctionLiteral(_)
| Type::Callable(_)
| Type::ModuleLiteral(_)
Expand Down
Loading