Remove some `ref` patterns from the compiler #106090

WaffleLapkin · 2022-12-23T17:40:29Z

Previous PR: #105368

rustbot · 2022-12-23T17:40:35Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Noratrieb

Thanks, most of those look way better now! One let_else fomatting fix (really excited for the day when rustfmt will finally work with it :D) and a nit that you may or may not address, whatever you prefer.
r=me then

compiler/rustc_const_eval/src/interpret/operand.rs

compiler/rustc_const_eval/src/transform/promote_consts.rs

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

compiler/rustc_const_eval/src/interpret/terminator.rs

bors · 2022-12-29T02:23:48Z

☔ The latest upstream changes (presumably #106228) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2023-01-12T14:13:20Z

☔ The latest upstream changes (presumably #106760) made this pull request unmergeable. Please resolve the merge conflicts.

WaffleLapkin · 2023-01-12T18:58:50Z

I think I've addressed all review comments. @rustbot ready

bors · 2023-01-13T14:09:22Z

☔ The latest upstream changes (presumably #106801) made this pull request unmergeable. Please resolve the merge conflicts.

compiler-errors · 2023-01-13T21:28:07Z

@bors try @rust-timer queue

bors · 2023-01-13T21:28:16Z

⌛ Trying commit 93f40f77ea04d0f59f10f0dda242814e4df5cc44 with merge 5cb9c9d58b4d1ad3f602047be2697d7569345deb...

compiler/rustc_trait_selection/src/traits/query/normalize.rs

Noratrieb

A few more comments, but looking good overall

compiler/rustc_const_eval/src/interpret/operand.rs

compiler/rustc_const_eval/src/interpret/validity.rs

compiler/rustc_data_structures/src/sorted_map.rs

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

Noratrieb · 2023-01-13T21:13:17Z

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

-        }
-        _ => bug!("{:?} is not a method", impl_m),
+    let mut impl_args = {
+        let ImplItemKind::Fn(sig, _) = &tcx.hir().expect_impl_item(impl_m.def_id.expect_local()).kind else { bug!("{:?} is not a method", impl_m) };


All of these bugs make me think that we should have expect_* methods on ImplItemKind - but that's something for the future

Noratrieb · 2023-01-13T21:18:29Z

compiler/rustc_trait_selection/src/traits/query/normalize.rs

                }
            }

-            _ => ty.try_super_fold_with(self),
-        })()?;


Very weird, I hope there wasn't something weird going on, but the change looks correct🤨. Well, there are quite a few of those around, I guess it's just an artifact of refactorings and made sense at some point.

Yeah, when I was removing these I was triple checking in case I've missed something ><

bors · 2023-01-13T23:39:46Z

☀️ Try build successful - checks-actions
Build commit: 5cb9c9d58b4d1ad3f602047be2697d7569345deb (5cb9c9d58b4d1ad3f602047be2697d7569345deb)

rustfmt, pleaaaaase, start supporting rust Co-authored-by: nils <48135649+Nilstrieb@users.noreply.github.com>

- add back accidentally removed new lines - try to deref in patterns, rather than in expressions (maybe this was the reason of perf regression?...)

WaffleLapkin · 2023-01-17T11:25:14Z

@bors try
The CI failure should be fixed, but I can't test this locally.

WaffleLapkin · 2023-01-17T14:38:48Z

The builder that was failing now passes, so I think this should be ready to be merged.

Noratrieb · 2023-01-19T17:10:48Z

src/tools/compiletest/src/read2.rs

+
+                // Skip over '{' at the start of the tail, so we don't later wrongfully consider this as json.
+                // See <https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/Weird.20CI.20failure/near/321797811>
+                while tail.get(0) == Some(&b'{') {
+                    tail = &tail[1..];
+                    skipped += 1;
+                }


this is, uh, certainly something. fun that no one has hit this before, you were the lucky one!

Noratrieb · 2023-01-19T17:12:52Z

That was quite a PR, as I said already it would be nice if it was better split-up next time. But anyways, should be good to go now!
@bors r+

bors · 2023-01-19T17:12:54Z

📌 Commit 65d1e8d has been approved by Nilstrieb

It is now in the queue for this repository.

bors · 2023-01-20T04:52:32Z

⌛ Testing commit 65d1e8d with merge 56ee852...

bors · 2023-01-20T08:06:58Z

☀️ Test successful - checks-actions
Approved by: Nilstrieb
Pushing 56ee852 to master...

rust-timer · 2023-01-20T10:20:05Z

Finished benchmarking commit (56ee852): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.2%	[-0.2%, -0.1%]	3
Improvements ✅ (secondary)	-0.3%	[-0.5%, -0.3%]	5
All ❌✅ (primary)	-0.2%	[-0.2%, -0.1%]	3

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.1%	[1.9%, 2.2%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.2%	[-1.2%, -1.2%]	1
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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.3%	[-3.3%, -3.3%]	1
All ❌✅ (primary)	-	-	0

rustbot assigned Noratrieb Dec 23, 2022

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 Dec 23, 2022

Noratrieb reviewed Dec 23, 2022

View reviewed changes

compiler/rustc_const_eval/src/interpret/operand.rs Outdated Show resolved Hide resolved

compiler/rustc_const_eval/src/transform/promote_consts.rs Outdated Show resolved Hide resolved

RalfJung reviewed Dec 24, 2022

View reviewed changes

compiler/rustc_const_eval/src/const_eval/eval_queries.rs Outdated Show resolved Hide resolved

kadiwa4 reviewed Dec 27, 2022

View reviewed changes

compiler/rustc_const_eval/src/interpret/terminator.rs Outdated Show resolved Hide resolved

Noratrieb 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 Jan 3, 2023

rust-cloud-vms bot force-pushed the dereffffffffff branch from 54e9d25 to 958017a Compare January 9, 2023 17:11

This comment has been minimized.

Sign in to view

rust-cloud-vms bot force-pushed the dereffffffffff branch 2 times, most recently from 9d1af0b to 5d1202b Compare January 12, 2023 18:39

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 Jan 12, 2023

rust-cloud-vms bot force-pushed the dereffffffffff branch from 290bc56 to 93f40f7 Compare January 13, 2023 15:04

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 Jan 13, 2023

compiler-errors reviewed Jan 13, 2023

View reviewed changes

compiler/rustc_trait_selection/src/traits/query/normalize.rs Outdated Show resolved Hide resolved

Noratrieb reviewed Jan 13, 2023

View reviewed changes

Noratrieb 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 Jan 13, 2023

WaffleLapkin and others added 7 commits January 17, 2023 07:48

rustc_hir_analysis: some general code improvements

d60e772

rustc_hir_analysis: remove ref patterns

09485ea

tidy

66751ea

rustfmt, pleaaaaase, start supporting rust Co-authored-by: nils <48135649+Nilstrieb@users.noreply.github.com>

Undo questionable changes

98f30e8

Review suggestions

8d3c90a

Self review suggestions

c21b1f7

- add back accidentally removed new lines - try to deref in patterns, rather than in expressions (maybe this was the reason of perf regression?...)

Untouch back perf sensetive code 😅

4a6d9de

rust-cloud-vms bot force-pushed the dereffffffffff branch from ed36f2e to 4a6d9de Compare January 17, 2023 11:02

rustbot added the A-testsuite Area: The testsuite used to check the correctness of rustc label Jan 17, 2023

Hack compiletest to fix a random CI failure

65d1e8d

rust-cloud-vms bot force-pushed the dereffffffffff branch from d85d820 to 65d1e8d Compare January 17, 2023 11:23

rustbot added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Jan 17, 2023

rust-cloud-vms bot force-pushed the dereffffffffff branch from 7b10723 to b1ece2e Compare January 17, 2023 11:38

WaffleLapkin removed the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Jan 17, 2023

rust-cloud-vms bot force-pushed the dereffffffffff branch from b1ece2e to 65d1e8d Compare January 17, 2023 14:38

Noratrieb reviewed Jan 19, 2023

View reviewed changes

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 Jan 19, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 20, 2023

bors merged commit 56ee852 into rust-lang:master Jan 20, 2023

rustbot added this to the 1.68.0 milestone Jan 20, 2023

bors mentioned this pull request Jan 20, 2023

Switch to EarlyBinder for fn_sig query #107055

Merged

WaffleLapkin deleted the dereffffffffff branch January 20, 2023 10:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove some `ref` patterns from the compiler #106090

Remove some `ref` patterns from the compiler #106090

WaffleLapkin commented Dec 23, 2022

rustbot commented Dec 23, 2022

Noratrieb left a comment

bors commented Dec 29, 2022

This comment has been minimized.

bors commented Jan 12, 2023

WaffleLapkin commented Jan 12, 2023 •

edited

Loading

bors commented Jan 13, 2023

compiler-errors commented Jan 13, 2023

This comment has been minimized.

bors commented Jan 13, 2023

Noratrieb left a comment

Noratrieb Jan 13, 2023

Noratrieb Jan 13, 2023

WaffleLapkin Jan 14, 2023

bors commented Jan 13, 2023

WaffleLapkin commented Jan 17, 2023

WaffleLapkin commented Jan 17, 2023

Noratrieb Jan 19, 2023

Noratrieb commented Jan 19, 2023

bors commented Jan 19, 2023

bors commented Jan 20, 2023

bors commented Jan 20, 2023

rust-timer commented Jan 20, 2023

Remove some ref patterns from the compiler #106090

Remove some ref patterns from the compiler #106090

Conversation

WaffleLapkin commented Dec 23, 2022

rustbot commented Dec 23, 2022

Noratrieb left a comment

Choose a reason for hiding this comment

bors commented Dec 29, 2022

This comment has been minimized.

bors commented Jan 12, 2023

WaffleLapkin commented Jan 12, 2023 • edited Loading

bors commented Jan 13, 2023

compiler-errors commented Jan 13, 2023

This comment has been minimized.

bors commented Jan 13, 2023

Noratrieb left a comment

Choose a reason for hiding this comment

Noratrieb Jan 13, 2023

Choose a reason for hiding this comment

Noratrieb Jan 13, 2023

Choose a reason for hiding this comment

WaffleLapkin Jan 14, 2023

Choose a reason for hiding this comment

bors commented Jan 13, 2023

WaffleLapkin commented Jan 17, 2023

WaffleLapkin commented Jan 17, 2023

Noratrieb Jan 19, 2023

Choose a reason for hiding this comment

Noratrieb commented Jan 19, 2023

bors commented Jan 19, 2023

bors commented Jan 20, 2023

bors commented Jan 20, 2023

rust-timer commented Jan 20, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Remove some `ref` patterns from the compiler #106090

Remove some `ref` patterns from the compiler #106090

WaffleLapkin commented Jan 12, 2023 •

edited

Loading