Rollup of 5 pull requests #117087

matthiaskrgr · 2023-10-23T14:23:55Z

Successful merges:

Location-insensitive polonius: consider a loan escaping if an SCC has member constraints applied only #116960 (Location-insensitive polonius: consider a loan escaping if an SCC has member constraints applied only)
Rewrite gdb pretty-printer registration #116978 (Rewrite gdb pretty-printer registration)
coverage: Add UI tests for values accepted by -Cinstrument-coverage #117040 (coverage: Add UI tests for values accepted by -Cinstrument-coverage)
Eliminate rustc_attrs::builtin::handle_errors in favor of emitting errors directly #117064 (Eliminate rustc_attrs::builtin::handle_errors in favor of emitting errors directly)
Fix suggestion for renamed coroutines feature #117073 (Fix suggestion for renamed coroutines feature)

r? @ghost
@rustbot modify labels: rollup

Currently, the Rust pretty-printers are registered in gdb using the uninformative name "lookup": (gdb) info pretty-printer global pretty-printers: [...] objfile /home/tromey/[...] lookup It's nicer for users if the top-level registration is given a clear name. Additionally, gdb lets users individually enable and disable specific printers, provided they are registered correctly. This patch implements both these ideas. Now the output looks like: (gdb) info pretty-printer global pretty-printers: [...] objfile /home/tromey/[...] rust StdArc StdBTreeMap StdBTreeSet StdCell StdHashMap StdHashSet StdNonZeroNumber StdOsString StdRc StdRef StdRefCell StdRefMut StdSlice StdStr StdString StdVec StdVecDeque

…pe, r=matthewjasper Location-insensitive polonius: consider a loan escaping if an SCC has member constraints applied only The location-insensitive analysis considered loans to escape if there were member constraints, which makes *some* sense for scopes and matches the scopes that NLL computes on all the tests. However, polonius and NLLs differ on the fuzzed case rust-lang#116657, where an SCC has member constraints but no applied ones (and is kinda surprising). The existing UI tests with member constraints impacting scopes all have some constraint applied. This PR changes the location-insensitive analysis to consider a loan to escape if there are applied member constraints, and for extra paranoia/insurance via fuzzing and crater: actually checks the constraint's min choice is indeed a universal region as we expect. (This could be turned into a `debug_assert` and early return as a slight optimization after these periods of verification) The 4 UI tests where member constraints are meaningful for computing scopes still pass obviously, and this also fixes rust-lang#116657. r? `@matthewjasper`

…rk-Simulacrum Rewrite gdb pretty-printer registration Currently, the Rust pretty-printers are registered in gdb using the uninformative name "lookup": (gdb) info pretty-printer global pretty-printers: [...] objfile /home/tromey/[...] lookup It's nicer for users if the top-level registration is given a clear name. Additionally, gdb lets users individually enable and disable specific printers, provided they are registered correctly. This patch implements both these ideas. Now the output looks like: (gdb) info pretty-printer global pretty-printers: [...] objfile /home/tromey/[...] rust StdArc StdBTreeMap StdBTreeSet StdCell StdHashMap StdHashSet StdNonZeroNumber StdOsString StdRc StdRef StdRefCell StdRefMut StdSlice StdStr StdString StdVec StdVecDeque

…=cjgillot coverage: Add UI tests for values accepted by `-Cinstrument-coverage` I wanted to clean up the code in `parse_instrument_coverage`, but it occurred to me that we currently don't have any UI tests for the various stable and unstable values supported by this flag. --- Normally it might be overkill to individually test all the different variants of `on`/`off`, but in this case the parsing of those values is mixed in with some other custom code, so I think it's worthwhile being thorough.

Eliminate rustc_attrs::builtin::handle_errors in favor of emitting errors directly Suggested in rust-lang#116773 (review). This `handle_errors` function is originally from rust-lang#34531, in which it was useful because it allowed error messages and error codes (`E0542`) for multiple occurrences of the same error to be centralized in one place. For example rather than repeating this diagnostic in 2 places: ```rust span_err!(diagnostic, attr.span, E0542, "missing 'since'"); ``` one could repeat this instead: ```rust handle_errors(diagnostic, attr.span, AttrError::MissingSince); ``` ensuring that all "missing 'since'" errors always remained consistent in message and error code. Over time as error messages and error codes got factored to fluent diagnostics (rust-lang#100836), this rationale no longer applies. The new code has the same benefit while being less verbose (+73, -128). ```rust sess.emit_err(session_diagnostics::MissingSince { span: attr.span }); ``` r? `@cjgillot`

…ename-suggestion, r=lqd Fix suggestion for renamed coroutines feature This fixes a small typo from rust-lang#116958

matthiaskrgr · 2023-10-23T14:24:10Z

@bors r+ rollup=never p=5

bors · 2023-10-23T14:24:12Z

📌 Commit f4dfd8d has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-23T16:04:51Z

⌛ Testing commit f4dfd8d with merge e2068cd...

bors · 2023-10-23T18:04:37Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing e2068cd to master...

rust-timer · 2023-10-23T18:06:03Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116960	Location-insensitive polonius: consider a loan escaping if …	`deef8a82883dd3ed0f6204b228ecdf2030d3308b` (link)
#116978	Rewrite gdb pretty-printer registration	`f534fb17629077f5614544f42309c41d42415237` (link)
#117040	coverage: Add UI tests for values accepted by `-Cinstrument…	`4d8b8de901cdca93947860c57e657a142e5c88e4` (link)
#117064	Eliminate rustc_attrs::builtin::handle_errors in favor of e…	`6f002a9ae3c028c5172ff98a15b5a099534827b9` (link)
#117073	Fix suggestion for renamed coroutines feature	`53dc576a39dc013e200901bc709a324da2116008` (link)

previous master: 858a42bf46

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-10-23T21:34:53Z

Finished benchmarking commit (e2068cd): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

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

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	3.8%	[3.8%, 3.8%]	1
Regressions ❌ (secondary)	3.3%	[2.2%, 4.3%]	8
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.8%	[3.8%, 3.8%]	1

Binary size

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

Bootstrap: missing data
Artifact size: 304.33 MiB -> 304.29 MiB (-0.01%)

rylev · 2023-10-27T09:20:28Z

Syn is noisy as of late

@rustbot label: +perf-regression-triaged

lqd and others added 15 commits October 19, 2023 21:11

add non-regression test for issue 116657

8b76518

make applied_member_constraints accept an SCC instead of a region

c69bd94

consider a loan escapes the function via applied member constraints

fa45efa

slight Default cleanup for option

d9c213c

Eliminate rustc_attr::builtin::handle_errors

f5429a0

Eliminate redundant .parse_sess in rustc_attr::builtin errors

2878529

coverage: Add UI tests for values accepted by -Cinstrument-coverage

f83f796

Fix comment: coverage-map tests compile to LLVM IR, not MIR

71b7322

Fix suggestion for renamed coroutines feature

a6c2481

Rollup merge of rust-lang#117073 - yotamofek:fix-coroutines-feature-r…

f4dfd8d

…ename-suggestion, r=lqd Fix suggestion for renamed coroutines feature This fixes a small typo from rust-lang#116958

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 Oct 23, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 23, 2023

bors merged commit e2068cd into rust-lang:master Oct 23, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 23, 2023

This was referenced Oct 23, 2023

Apply structured suggestion that allows test to work since 1.64 #116244

Merged

Validate feature and since values inside #[stable(…)] #116773

Merged

rustbot added the perf-regression Performance regression. label Oct 23, 2023

rustbot added the perf-regression-triaged The performance regression has been triaged. label Oct 27, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

matthiaskrgr deleted the rollup-08kkjkz branch March 16, 2024 18:18

matthiaskrgr mentioned this pull request Apr 16, 2024

ICE: node HirId ... cannot be placed in TypeckResults with hir_owner DefId... #124022

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #117087

Rollup of 5 pull requests #117087

matthiaskrgr commented Oct 23, 2023

matthiaskrgr commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

rust-timer commented Oct 23, 2023

rust-timer commented Oct 23, 2023

rylev commented Oct 27, 2023

Rollup of 5 pull requests #117087

Rollup of 5 pull requests #117087

Conversation

matthiaskrgr commented Oct 23, 2023

matthiaskrgr commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

rust-timer commented Oct 23, 2023

rust-timer commented Oct 23, 2023

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

rylev commented Oct 27, 2023