Resolver: refact macro map into external and local maps by LorrensP-2158466 · Pull Request #143657 · rust-lang/rust

LorrensP-2158466 · 2025-07-08T21:55:27Z

Puts MacroData inside of the ResolverArena and splits macro_map into 2 maps: local_macro_map and external_macro_map. This way get_macro_by_def_id can take a &Resolver instead of a mutable one.

Part of #gsoc > Project: Parallel Macro Expansion

r? @petrochenkov

compiler/rustc_resolve/src/lib.rs

compiler/rustc_resolve/src/macros.rs

compiler/rustc_resolve/src/build_reduced_graph.rs

compiler/rustc_resolve/src/lib.rs

compiler/rustc_resolve/src/build_reduced_graph.rs

petrochenkov · 2025-07-09T19:23:43Z

This looks ready, r=me after squashing into two commits, one for MacroRulesScopeRef and another for everything else.
(Also @rustbot ready can be used to send a PR back to review when ready.)

LorrensP-2158466 · 2025-07-09T21:13:07Z

Oh yeah, I forgot it because you were so quick with the responses (and because I had to head out :) ).

…nd local_macro_map.

LorrensP-2158466 · 2025-07-09T21:31:13Z

@rustbot ready

petrochenkov · 2025-07-10T06:19:46Z

@bors r+

bors · 2025-07-10T06:19:50Z

📌 Commit e566783 has been approved by petrochenkov

It is now in the queue for this repository.

Rollup of 12 pull requests Successful merges: - #136906 (Add checking for unnecessary delims in closure body) - #143652 (docs: document trait upcasting rules in `Unsize` trait) - #143657 (Resolver: refact macro map into external and local maps) - #143659 (Use "Innermost" & "Outermost" terminology for `AttributeOrder`) - #143663 (fix: correct typo in attr_parsing_previously_accepted message key) - #143666 (Re-expose nested bodies in rustc_borrowck::consumers) - #143668 (Fix VxWorks build errors) - #143670 (Add a new maintainer to the wasm32-wasip1 target) - #143675 (improve lint doc text) - #143683 (Assorted `run-make-support` maintenance) - #143695 (Auto-add `S-waiting-on-author` when the PR is/switches to draft state) - #143706 (triagebot.toml: ping lolbinarycat if tidy extra checks were modified) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #143657 - LorrensP-2158466:split-macro-map, r=petrochenkov Resolver: refact macro map into external and local maps Puts `MacroData` inside of the `ResolverArena` and splits `macro_map` into 2 maps: `local_macro_map` and `external_macro_map`. This way `get_macro_by_def_id` can take a `&Resolver` instead of a mutable one. Part of [#gsoc > Project: Parallel Macro Expansion](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/with/516965603) r? `@petrochenkov`

Kobzol · 2025-07-10T18:13:00Z

@rust-timer build c212528

Checking for #143731.

rust-timer · 2025-07-10T22:38:19Z

Finished benchmarking commit (c212528): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary -2.1%, secondary 0.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.1%	[2.1%, 6.1%]	5
Improvements ✅ (primary)	-2.1%	[-3.1%, -1.0%]	2
Improvements ✅ (secondary)	-4.8%	[-6.0%, -3.5%]	3
All ❌✅ (primary)	-2.1%	[-3.1%, -1.0%]	2

Cycles

Results (secondary -3.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.0%	[-3.0%, -3.0%]	1
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 463.013s -> 463.712s (0.15%)
Artifact size: 374.51 MiB -> 374.50 MiB (-0.00%)

Rollup of 12 pull requests Successful merges: - rust-lang/rust#136906 (Add checking for unnecessary delims in closure body) - rust-lang/rust#143652 (docs: document trait upcasting rules in `Unsize` trait) - rust-lang/rust#143657 (Resolver: refact macro map into external and local maps) - rust-lang/rust#143659 (Use "Innermost" & "Outermost" terminology for `AttributeOrder`) - rust-lang/rust#143663 (fix: correct typo in attr_parsing_previously_accepted message key) - rust-lang/rust#143666 (Re-expose nested bodies in rustc_borrowck::consumers) - rust-lang/rust#143668 (Fix VxWorks build errors) - rust-lang/rust#143670 (Add a new maintainer to the wasm32-wasip1 target) - rust-lang/rust#143675 (improve lint doc text) - rust-lang/rust#143683 (Assorted `run-make-support` maintenance) - rust-lang/rust#143695 (Auto-add `S-waiting-on-author` when the PR is/switches to draft state) - rust-lang/rust#143706 (triagebot.toml: ping lolbinarycat if tidy extra checks were modified) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned petrochenkov Jul 8, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 8, 2025

petrochenkov reviewed Jul 9, 2025

View reviewed changes

bjorn3 reviewed Jul 9, 2025

View reviewed changes

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 9, 2025

petrochenkov reviewed Jul 9, 2025

View reviewed changes

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/build_reduced_graph.rs Outdated Show resolved Hide resolved

LorrensP-2158466 added 2 commits July 9, 2025 23:24

MacroData in ResolverArenas + split macro_map into extern_macro_map a…

e9e31b1

…nd local_macro_map.

Use reference for MacroRulesScopeRef instead of Interned.

e566783

LorrensP-2158466 force-pushed the split-macro-map branch from c24ab4c to e566783 Compare July 9, 2025 21:31

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 9, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 10, 2025

matthiaskrgr mentioned this pull request Jul 10, 2025

Rollup of 12 pull requests #143731

Merged

bors merged commit f587784 into rust-lang:master Jul 10, 2025
11 checks passed

rustbot added this to the 1.90.0 milestone Jul 10, 2025

This comment has been minimized.

Sign in to view

LorrensP-2158466 deleted the split-macro-map branch July 13, 2025 10:48

Uh oh!

Conversation

LorrensP-2158466 commented Jul 8, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Jul 9, 2025

Uh oh!

LorrensP-2158466 commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

LorrensP-2158466 commented Jul 9, 2025

Uh oh!

petrochenkov commented Jul 10, 2025

Uh oh!

bors commented Jul 10, 2025

Uh oh!

Uh oh!

Kobzol commented Jul 10, 2025

Uh oh!

This comment has been minimized.

rust-timer commented Jul 10, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

LorrensP-2158466 commented Jul 9, 2025 •

edited

Loading