Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic` #139468

compiler-errors · 2025-04-07T05:38:30Z

More unnecessary incurred span tracking avoided by not calling span.with_parent(None). This is useless on its own but makes it much easier to fix other "span tracking on the good path" issues in the future.

r? oli-obk

compiler-errors · 2025-04-07T05:38:38Z

@bors try @rust-timer queue

bors · 2025-04-07T05:39:49Z

⌛ Trying commit 253da2f with merge 5336b4a...

…ic, r=<try> Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic` More unnecessary incurred span tracking avoided by not calling `span.with_parent(None)`. r? oli-obk

compiler-errors · 2025-04-07T05:40:10Z

compiler/rustc_errors/src/lib.rs

@@ -983,7 +991,14 @@ impl<'a> DiagCtxtHandle<'a> {
    }

    pub fn has_stashed_diagnostic(&self, span: Span, key: StashKey) -> bool {
-        self.inner.borrow().stashed_diagnostics.get(&(span.with_parent(None), key)).is_some()
+        let inner = self.inner.borrow();


You may wonder... is it sufficient here to just call self.inner.borrow().stashed_diagnostics.is_empty() as a fast path, b/c we obviously should never have stashed diagnostics on the good path?

Well no! We stash AssociatedTypeSuggestion in a bunch of places on the good path! What the heck, lol. I'll open a separate PR to gauge the perf impact of that.

bors · 2025-04-07T07:48:30Z

☀️ Try build successful - checks-actions
Build commit: 5336b4a (5336b4a39d2955d5ae9606b177e4baef7acfeb1f)

rust-timer · 2025-04-07T11:00:50Z

Finished benchmarking commit (5336b4a): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to 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)

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

Cycles

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

Binary size

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

Bootstrap: 779.04s -> 777.727s (-0.17%)
Artifact size: 365.93 MiB -> 365.94 MiB (0.00%)

compiler-errors · 2025-04-07T14:50:35Z

@bors rollup=maybe

oli-obk · 2025-04-07T15:50:00Z

@bors r+

bors · 2025-04-07T15:50:03Z

📌 Commit 253da2f has been approved by oli-obk

It is now in the queue for this repository.

…stic, r=oli-obk Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic` More unnecessary incurred span tracking avoided by not calling `span.with_parent(None)`. This is useless on its own but makes it much easier to fix other "span tracking on the good path" issues in the future. r? oli-obk

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#139124 (compiler: report error when trait object type param reference self) - rust-lang#139346 (Don't construct preds w escaping bound vars in `diagnostic_hir_wf_check`) - rust-lang#139379 (Use delayed bug for normalization errors in drop elaboration) - rust-lang#139421 (Fix trait upcasting to dyn type with no principal when there are projections) - rust-lang#139468 (Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic`) - rust-lang#139476 (rm `RegionInferenceContext::var_infos`) - rust-lang#139490 (Update some comment/docs related to "extern intrinsic" removal) r? `@ghost` `@rustbot` modify labels: rollup

…stic, r=oli-obk Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic` More unnecessary incurred span tracking avoided by not calling `span.with_parent(None)`. This is useless on its own but makes it much easier to fix other "span tracking on the good path" issues in the future. r? oli-obk

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#139124 (compiler: report error when trait object type param reference self) - rust-lang#139346 (Don't construct preds w escaping bound vars in `diagnostic_hir_wf_check`) - rust-lang#139421 (Fix trait upcasting to dyn type with no principal when there are projections) - rust-lang#139468 (Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic`) - rust-lang#139476 (rm `RegionInferenceContext::var_infos`) - rust-lang#139490 (Update some comment/docs related to "extern intrinsic" removal) r? `@ghost` `@rustbot` modify labels: rollup

…stic, r=oli-obk Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic` More unnecessary incurred span tracking avoided by not calling `span.with_parent(None)`. This is useless on its own but makes it much easier to fix other "span tracking on the good path" issues in the future. r? oli-obk

…errors Rollup of 19 pull requests Successful merges: - rust-lang#138676 (Implement overflow for infinite implied lifetime bounds) - rust-lang#139024 (Make error message for missing fields with `..` and without `..` more consistent) - rust-lang#139098 (Tell LLVM about impossible niche tags) - rust-lang#139124 (compiler: report error when trait object type param reference self) - rust-lang#139321 (Update to new rinja version (askama)) - rust-lang#139346 (Don't construct preds w escaping bound vars in `diagnostic_hir_wf_check`) - rust-lang#139386 (make it possible to use stage0 libtest on compiletest) - rust-lang#139421 (Fix trait upcasting to dyn type with no principal when there are projections) - rust-lang#139468 (Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic`) - rust-lang#139476 (rm `RegionInferenceContext::var_infos`) - rust-lang#139481 (Add job summary links to post-merge report) - rust-lang#139485 (compiletest: Stricter parsing for diagnostic kinds) - rust-lang#139490 (Update some comment/docs related to "extern intrinsic" removal) - rust-lang#139491 (Update books) - rust-lang#139496 (Revert r-a changes of rust-lang#139455) - rust-lang#139500 (document panic behavior of Vec::resize and Vec::resize_with) - rust-lang#139501 (Fix stack overflow in exhaustiveness due to recursive HIR opaque hidden types) - rust-lang#139504 (add missing word in doc comment) - rust-lang#139507 (compiletest: Trim whitespace from environment variable names) r? `@ghost` `@rustbot` modify labels: rollup

…stic, r=oli-obk Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic` More unnecessary incurred span tracking avoided by not calling `span.with_parent(None)`. This is useless on its own but makes it much easier to fix other "span tracking on the good path" issues in the future. r? oli-obk

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#137412 (Ensure `swap_nonoverlapping` is really always untyped) - rust-lang#138869 (Try not to use verbatim paths in `Command::current_dir`) - rust-lang#138993 (Make `cfg_match!` a semitransparent macro) - rust-lang#139099 (Promise `array::from_fn` is generated in order of increasing indices) - rust-lang#139364 (Make the compiler suggest actual paths instead of visible paths if the visible paths are through any doc hidden path.) - rust-lang#139468 (Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic`) - rust-lang#139481 (Add job summary links to post-merge report) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#138869 (Try not to use verbatim paths in `Command::current_dir`) - rust-lang#138993 (Make `cfg_match!` a semitransparent macro) - rust-lang#139099 (Promise `array::from_fn` is generated in order of increasing indices) - rust-lang#139364 (Make the compiler suggest actual paths instead of visible paths if the visible paths are through any doc hidden path.) - rust-lang#139468 (Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic`) - rust-lang#139481 (Add job summary links to post-merge report) - rust-lang#139573 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#139468 - compiler-errors:has_stashed_diagnostic, r=oli-obk Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic` More unnecessary incurred span tracking avoided by not calling `span.with_parent(None)`. This is useless on its own but makes it much easier to fix other "span tracking on the good path" issues in the future. r? oli-obk

Don't call Span.with_parent on the good path in has_stashed_diagnostic

253da2f

rustbot assigned oli-obk Apr 7, 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 Apr 7, 2025

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 7, 2025

compiler-errors commented Apr 7, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 7, 2025

compiler-errors marked this pull request as ready for review April 7, 2025 14:50

compiler-errors mentioned this pull request Apr 7, 2025

[experiment] Why are we stashing diagnostics on the good path 🤔 #139470

Closed

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 Apr 7, 2025

matthiaskrgr mentioned this pull request Apr 7, 2025

Rollup of 7 pull requests #139497

Closed

matthiaskrgr mentioned this pull request Apr 7, 2025

Rollup of 6 pull requests #139499

Closed

Zalathar mentioned this pull request Apr 8, 2025

Rollup of 19 pull requests #139508

Closed

matthiaskrgr mentioned this pull request Apr 9, 2025

Rollup of 7 pull requests #139571

Closed

matthiaskrgr mentioned this pull request Apr 9, 2025

Rollup of 7 pull requests #139581

Merged

bors merged commit db7e32c into rust-lang:master Apr 9, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone Apr 9, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic` #139468

Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic` #139468

compiler-errors commented Apr 7, 2025 •

edited

Loading

compiler-errors commented Apr 7, 2025

This comment has been minimized.

bors commented Apr 7, 2025

compiler-errors Apr 7, 2025

bors commented Apr 7, 2025

This comment has been minimized.

rust-timer commented Apr 7, 2025

compiler-errors commented Apr 7, 2025

oli-obk commented Apr 7, 2025

bors commented Apr 7, 2025

Don't call Span::with_parent on the good path in has_stashed_diagnostic #139468

Don't call Span::with_parent on the good path in has_stashed_diagnostic #139468

Conversation

compiler-errors commented Apr 7, 2025 • edited Loading

compiler-errors commented Apr 7, 2025

This comment has been minimized.

bors commented Apr 7, 2025

compiler-errors Apr 7, 2025

Choose a reason for hiding this comment

bors commented Apr 7, 2025

This comment has been minimized.

rust-timer commented Apr 7, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

compiler-errors commented Apr 7, 2025

oli-obk commented Apr 7, 2025

bors commented Apr 7, 2025

Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic` #139468

Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic` #139468

compiler-errors commented Apr 7, 2025 •

edited

Loading