Make `HandleCycleError` an enum instead of a macro-generated closure by jyn514 · Pull Request #101303 · rust-lang/rust

jyn514 · 2022-09-02T01:47:34Z

Helps with #96524. Based on #100943 to avoid merge conflicts, so it looks larger than it is (only the last commit is relevant).

cc https://rust-lang.zulipchat.com/#narrow/stream/241847-t-compiler.2Fwg-incr-comp/topic/Moving.20.60Value.60.20to.20rustc_query_system.20.2396524

r? @cjgillot

compiler/rustc_query_system/src/values.rs

- Add a `HandleCycleError` enum to rustc_query_system, along with a `handle_cycle_error` function - Move `Value` to rustc_query_system, so `handle_cycle_error` can use it - Move the `Value` impls from rustc_query_impl to rustc_middle. This is necessary due to orphan rules.

jyn514 · 2022-09-07T00:33:55Z

@bors r=cjgillot rollup=never (perf-sensitive)

bors · 2022-09-07T00:33:56Z

📌 Commit 4856aff has been approved by cjgillot

It is now in the queue for this repository.

…r=cjgillot Make `HandleCycleError` an enum instead of a macro-generated closure Helps with rust-lang#96524. Based on rust-lang#100943 to avoid merge conflicts, so it looks larger than it is (only the last commit is relevant). cc https://rust-lang.zulipchat.com/#narrow/stream/241847-t-compiler.2Fwg-incr-comp/topic/Moving.20.60Value.60.20to.20rustc_query_system.20.2396524 r? `@cjgillot`

bors · 2022-09-07T12:56:50Z

⌛ Testing commit 4856aff with merge a62340464732372726d292abb0be24a6e2d9b7be...

bors · 2022-09-07T12:59:22Z

💔 Test failed - checks-actions

jyn514 · 2022-09-07T13:02:04Z

@bors tree closed

GitHub is giving 500s again.

jyn514 · 2022-09-07T13:02:19Z

@bors treeclosed

rust-log-analyzer · 2022-09-07T18:50:30Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

jyn514 · 2022-09-07T18:56:14Z

@bors retry

bors · 2022-09-08T02:21:19Z

⌛ Testing commit 4856aff with merge 4af35b8...

bors · 2022-09-08T05:02:26Z

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing 4af35b8 to master...

rust-timer · 2022-09-08T07:38:08Z

Finished benchmarking commit (4af35b8): 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)	1.2%	[1.1%, 1.3%]	2
Regressions ❌ (secondary)	3.4%	[3.1%, 3.9%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.2%	[1.1%, 1.3%]	2

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)	2.4%	[0.7%, 3.7%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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)	-	-	0
Regressions ❌ (secondary)	2.7%	[2.2%, 3.1%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

rylev · 2022-09-08T10:25:45Z

The supposed regressions are mostly in keccak, which has been bimodal and noisy lately.

@rustbot label: +perf-regression-triaged

…ivooeo Rename `HandleCycleError` to `CycleErrorHandling` In rust-lang#101303, the `handle_cycle_error` field was changed from a macro-generated closure to a macro-selected enum variant. But it was not renamed to reflect the fact that it now holds data, not code. Renaming the field and its associated enum to `cycle_error_handling: CycleErrorHandling` should make the relevant code less confusing to read. This PR also moves the enum out of `rustc_query_system::error`, where it was easily confused with diagnostic structs. There should be no change to compiler behaviour.

Rollup merge of #151520 - Zalathar:cycle-error-handling, r=Kivooeo Rename `HandleCycleError` to `CycleErrorHandling` In #101303, the `handle_cycle_error` field was changed from a macro-generated closure to a macro-selected enum variant. But it was not renamed to reflect the fact that it now holds data, not code. Renaming the field and its associated enum to `cycle_error_handling: CycleErrorHandling` should make the relevant code less confusing to read. This PR also moves the enum out of `rustc_query_system::error`, where it was easily confused with diagnostic structs. There should be no change to compiler behaviour.

jyn514 added the A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) label Sep 2, 2022

rust-highfive assigned cjgillot Sep 2, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 2, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 2, 2022

cjgillot reviewed Sep 2, 2022

View reviewed changes

compiler/rustc_query_system/src/values.rs Outdated Show resolved Hide resolved

cjgillot 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 Sep 5, 2022

jyn514 force-pushed the jnelson/handle-cycle-enum branch from 09d146c to 4856aff Compare September 7, 2022 00:26

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 7, 2022

Dylan-DPC mentioned this pull request Sep 7, 2022

Rollup of 8 pull requests #101526

Closed

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

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 Sep 7, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 8, 2022

bors merged commit 4af35b8 into rust-lang:master Sep 8, 2022

rustbot added this to the 1.65.0 milestone Sep 8, 2022

This was referenced Sep 8, 2022

Make typeck aware of uninhabited types #100288

Closed

Simplify caching and storage for queries #101307

Merged

rustbot added the perf-regression Performance regression. label Sep 8, 2022

rustbot added the perf-regression-triaged The performance regression has been triaged. label Sep 8, 2022

jyn514 deleted the jnelson/handle-cycle-enum branch September 8, 2022 15:27

jyn514 mentioned this pull request Sep 12, 2022

Refactor the query system to reduce the amount of macro-expanded functions #96524

Closed

6 tasks

Zalathar mentioned this pull request Jan 23, 2026

Rename HandleCycleError to CycleErrorHandling #151520

Merged

Uh oh!

Conversation

jyn514 commented Sep 2, 2022

Uh oh!

Uh oh!

jyn514 commented Sep 7, 2022

Uh oh!

bors commented Sep 7, 2022

Uh oh!

bors commented Sep 7, 2022

Uh oh!

bors commented Sep 7, 2022

Uh oh!

jyn514 commented Sep 7, 2022

Uh oh!

jyn514 commented Sep 7, 2022

Uh oh!

rust-log-analyzer commented Sep 7, 2022

Uh oh!

jyn514 commented Sep 7, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

rust-timer commented Sep 8, 2022

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

rylev commented Sep 8, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants