[ty] Compact retained definition and expression identities#25606
Merged
Conversation
Typing conformance resultsNo changes detected ✅Current numbersThe percentage of diagnostics emitted that were expected errors held steady at 92.13%. The percentage of expected errors that received a diagnostic held steady at 87.18%. The number of fully passing files held steady at 92/134. |
Memory usage reportSummary
Significant changesClick to expand detailed breakdownflake8
trio
sphinx
prefect
|
|
39d0b86 to
2f4082b
Compare
2f4082b to
0de40d5
Compare
MichaReiser
approved these changes
Jun 4, 2026
| self.db, | ||
| self.file, | ||
| self.current_scope(), | ||
| self.scope_ids_by_scope[self.current_scope()], |
Member
There was a problem hiding this comment.
Nit: Maybe add a self.current_scoipe_id() helper
| #[derive( | ||
| Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, salsa::Update, get_size2::GetSize, | ||
| )] | ||
| #[doc(hidden)] |
Member
There was a problem hiding this comment.
Can you say more why you decided to hide this type?
| } | ||
|
|
||
| #[derive( | ||
| Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, salsa::Update, get_size2::GetSize, |
Member
There was a problem hiding this comment.
Do we need all the derives here? E.g. PartialOrd? Hash? I don't really see a natural ordering for those.
| }, | ||
| Member { | ||
| id: ScopedMemberId, | ||
| is_reexported: bool, |
Member
There was a problem hiding this comment.
I think it's worth adding a comment saying why is_reexported is here instead of Definition. Or overall, adding a comment why this type exists in the first place. I understand is that DefinitionPlace has a nieche whereas having the bool on Definition adds 7 byte padding
|
|
||
| /// The scope in which the expression occurs. | ||
| pub file_scope: FileScopeId, | ||
| pub scope_id: ScopeId<'db>, |
Member
There was a problem hiding this comment.
The trade off here is reducing memory usage (by using the interned ScopeId) at the cost of a few more reads that must go through db (looking up the FileScopeId and File both need to go through db)
Comment on lines
71
to
73
| pub fn file_scope(self, db: &'db dyn Db) -> FileScopeId { | ||
| self.scope_id(db).file_scope_id(db) | ||
| } |
| impl get_size2::GetSize for Definition<'_> {} | ||
|
|
||
| impl<'db> Definition<'db> { | ||
| pub(crate) fn create( |
Member
There was a problem hiding this comment.
You can use new here and change the Salsa generated constructor by using
constructor = new_internal,
0de40d5 to
9d2f528
Compare
Member
Author
|
Thank you ❤️ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The semantic index includes a huge number of
DefinitionandExpressioningredients. Both retain file and file-local scope fields, even though the existingScopeIdidentifies both.This PR modifies the representations to store definition and expression scopes through
ScopeId, and pack a definition place and re-export state into one enum field. This preserves the existing accessors while reducing the fields retained by each tracked ingredient.I don't think I'm breaking any Salsa rules here, but I've been wrong before!