Skip to content

Make region_scope_tree a tcx method#154463

Closed
zetanumbers wants to merge 1 commit into
rust-lang:mainfrom
zetanumbers:region_scope_tree_root
Closed

Make region_scope_tree a tcx method#154463
zetanumbers wants to merge 1 commit into
rust-lang:mainfrom
zetanumbers:region_scope_tree_root

Conversation

@zetanumbers

@zetanumbers zetanumbers commented Mar 27, 2026

Copy link
Copy Markdown
Contributor

Continuing on #154304.

Currently region_scope_tree query itself calls tcx.region_scope_tree(tcx.typeck_root_def_id(key)) if its key isn't a type-check root. I thought this might be an overhead and made region_scope_tree a tcx method which calls region_scope_tree_root query instead.

@rustbot 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 Mar 27, 2026
@rustbot

rustbot commented Mar 27, 2026

Copy link
Copy Markdown
Collaborator

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler, types
  • compiler, types expanded to 69 candidates
  • Random selection from 12 candidates

@zetanumbers

Copy link
Copy Markdown
Contributor Author

r? @petrochenkov

Please run perf, I expect some improvements.

@rustbot rustbot assigned petrochenkov and unassigned JohnTitor Mar 27, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Mar 27, 2026
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 27, 2026
@rust-bors

rust-bors Bot commented Mar 27, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 5326cba (5326cba370d7cbf51afd8ae9e33a1ee1a3d58732, parent: e3691a5bd58e92999bcbffedf640ecd61e02c29e)

@rust-timer

This comment has been minimized.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (5326cba): comparison URL.

Overall result: ✅ improvements - 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

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.3% [-0.4%, -0.2%] 4
Improvements ✅
(secondary)
-0.2% [-0.2%, -0.2%] 1
All ❌✅ (primary) -0.3% [-0.4%, -0.2%] 4

Max RSS (memory usage)

Results (primary -0.2%)

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

mean range count
Regressions ❌
(primary)
2.9% [2.9%, 2.9%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.3% [-3.3%, -3.3%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.2% [-3.3%, 2.9%] 2

Cycles

Results (secondary -1.1%)

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)
2.3% [2.3%, 2.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.5% [-4.5%, -4.5%] 1
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 483.294s -> 491.715s (1.74%)
Artifact size: 395.05 MiB -> 395.04 MiB (-0.00%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 27, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

Not as wide effect as #154304, but a good optimization for serde_derive specifically.
@bors r+ rollup=maybe

@rust-bors

rust-bors Bot commented Mar 27, 2026

Copy link
Copy Markdown
Contributor

📌 Commit eb29fd7 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Mar 27, 2026
@zetanumbers

zetanumbers commented Mar 27, 2026

Copy link
Copy Markdown
Contributor Author

Not as wide effect as #154304, but a good optimization for serde_derive specifically. bors r+ rollup=maybe

Actually serde_derive only benefits for incremental scenarios, which rarely not happen in practice since crate dependencies are built non-incrementally either way. I think maybe we shouldn't merge this.

@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 28, 2026
@rust-bors

This comment was marked as resolved.

@rust-bors rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 28, 2026
/// Per-body `region::ScopeTree`. The `DefId` should be the owner `DefId` for the body;
/// in the case of closures, this will be redirected to the enclosing function.
query region_scope_tree(def_id: DefId) -> &'tcx crate::middle::region::ScopeTree {
/// Do not call directly! It's query implementation for method

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would call it directly in cases where the caller already has a typeck root.

@zetanumbers

Copy link
Copy Markdown
Contributor Author

@rustbot ready

@rustbot 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 Apr 14, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

Not as wide effect as #154304, but a good optimization for serde_derive specifically. bors r+ rollup=maybe

Actually serde_derive only benefits for incremental scenarios, which rarely not happen in practice since crate dependencies are built non-incrementally either way. I think maybe we shouldn't merge this.

If this helps serde, then it may help something else not covered by standard benchmarks.

This needs a rebase.
@rustbot author

@rustbot rustbot 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 Apr 15, 2026
@rustbot

rustbot commented Apr 15, 2026

Copy link
Copy Markdown
Collaborator

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@zetanumbers

Copy link
Copy Markdown
Contributor Author

Not worth it.

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants