Make ModuleId a tracked struct
#20001
Draft
+1,169
−1,213
Conversation
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
rustbot
added
the
S-waiting-on-review
Veykril
force-pushed
the
push-wkvlouswwywy
branch
from
52a4e61 to
77894b3
Compare
Veykril
commented
Jun 14, 2025
| @@ -474,7 +521,6 @@ fn outer() { | |||
| tests: t | |||
|
|
|||
| block scope::tests | |||
| name: _ | |||
There was a problem hiding this comment.
This is one of the bugs. name is not visible from here
Veykril
force-pushed
the
push-wkvlouswwywy
branch
from
77894b3 to
0f33ae9
Compare
|
What's the second bug? |
Veykril
force-pushed
the
push-wkvlouswwywy
branch
from
0f33ae9 to
2e64e8f
Compare
Veykril
commented
Jun 14, 2025
| @@ -4437,7 +4436,7 @@ impl Impl { | |||
| MacroCallKind::Derive { ast_id, derive_attr_index, derive_index, .. } => { | |||
| let module_id = self.id.lookup(db).container; | |||
| ( | |||
| crate_def_map(db, module_id.krate())[module_id.local_id] | |||
There was a problem hiding this comment.
Ah sorry. This is the second one. We were potentially using a local id of a block def map for the crate def map here.
Veykril
force-pushed
the
push-wkvlouswwywy
branch
from
2e64e8f to
caefec5
Compare
Veykril
force-pushed
the
push-wkvlouswwywy
branch
from
caefec5 to
623b670
Compare
Veykril
commented
Jun 14, 2025
| @@ -53,7 +53,7 @@ | |||
| <span class="macro public">foo</span><span class="macro_bang">!</span><span class="parenthesis">(</span><span class="struct declaration macro public">Bar</span><span class="parenthesis">)</span><span class="semicolon">;</span> | |||
| <span class="keyword">fn</span> <span class="function declaration">func</span><span class="parenthesis">(</span><span class="punctuation">_</span><span class="colon">:</span> <span class="module">y</span><span class="operator">::</span><span class="struct public">Bar</span><span class="parenthesis">)</span> <span class="brace">{</span> | |||
| <span class="keyword">mod</span> <span class="module declaration">inner</span> <span class="brace">{</span> | |||
| <span class="keyword">struct</span> <span class="struct declaration">Innerest</span><span class="angle"><</span><span class="keyword const">const</span> <span class="const_param const declaration">C</span><span class="colon">:</span> <span class="unresolved_reference">usize</span><span class="angle">></span> <span class="brace">{</span> <span class="field declaration">field</span><span class="colon">:</span> <span class="bracket">[</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span> <span class="brace">{</span><span class="const_param const">C</span><span class="brace">}</span><span class="bracket">]</span> <span class="brace">}</span> | |||
| <span class="keyword">struct</span> <span class="struct declaration">Innerest</span><span class="angle"><</span><span class="keyword const">const</span> <span class="const_param const declaration">C</span><span class="colon">:</span> <span class="unresolved_reference">usize</span><span class="angle">></span> <span class="brace">{</span> <span class="field declaration">field</span><span class="colon">:</span> <span class="bracket">[</span><span class="unresolved_reference">u32</span><span class="semicolon">;</span> <span class="brace">{</span><span class="const_param const">C</span><span class="brace">}</span><span class="bracket">]</span><span class="comma">,</span> <span class="field declaration">field2</span><span class="colon">:</span> <span class="punctuation">&</span><span class="struct">Innerest</span> <span class="brace">}</span> | |||
There was a problem hiding this comment.
There is a bug here, primtiives don't resolve correctly in modules within blocks
Veykril
force-pushed
the
push-wkvlouswwywy
branch
2 times, most recently
from
8c1ea13 to
eae79c3
Compare
Veykril
force-pushed
the
push-wkvlouswwywy
branch
from
eae79c3 to
362ef27
Compare
|
So this does increase memory usage by ~30mb 😕 I am not entirely sure why though I guess we have a lot of block def map queries, and us recording tracked structs in those now makes their memo's allocate the extra slot which is what is observable here? IO would've expected the |
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.
This is in part an experiment.
I am partially hoping for this to have a positive memory impact (as it shrinksit did not sadge. Funnily enough I also revealed 2 bugs with this (and fixed them).ModuleIdfrom 12 to 4 bytes)