perf: optimize ScopeData structure #1370
Open
Conversation
This file contains 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
Member
littledivy
commented
Dec 1, 2023
littledivy
commented
aapoalas
approved these changes
Dec 1, 2023
|
Did I just bring back the Rust compiler bug we had earlier? 👀 #1229 |
mmastrac
reviewed
Dec 1, 2023
| enum ScopeStatus { | ||
| Free, | ||
| Current { zombie: bool }, | ||
| Shadowed { zombie: bool }, | ||
| CurrentZombie, |
There was a problem hiding this comment.
If we #[cfg(debug_assertions)] here, the compiler may have more opportunities to optimize out the zombie code in release mode.
mmastrac
reviewed
Dec 1, 2023
Comment on lines
+1283
to
1286
| match self_mut.status { | ||
| ScopeStatus::CurrentZombie | ScopeStatus::CurrentNoZombie => self_mut, | ||
| _ => unreachable!(), | ||
| } |
There was a problem hiding this comment.
While we're in here, can we convert this match/unreachable pattern to a debug_assert?
mmastrac
reviewed
Dec 1, 2023
| @@ -1811,7 +1817,6 @@ pub(crate) mod data { | |||
|
|
|||
| #[derive(Debug)] | |||
| enum ScopeTypeSpecificData { | |||
| None, | |||
There was a problem hiding this comment.
Does Rust use the niche with Option? Is it the same size as ScopeTypeSpecificData?
|
Testing w/ASAN and opt-level=1. It's possible this is good to go and was just miscompiling. |
| @@ -1295,13 +1295,13 @@ pub(crate) mod data { | |||
| previous: Option<NonNull<ScopeData>>, | |||
| next: Option<Box<ScopeData>>, | |||
| // The 'status' field is also always valid (but does change). | |||
| status: Cell<ScopeStatus>, | |||
There was a problem hiding this comment.
Are you sure removing this Cell is safe?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.