Clean up `check_consts` and misc fixes #119072

fee1-dead · 2023-12-18T07:51:16Z

Remove most of the logic around erroring with trait methods. I have kept the part resolving it to a concrete impl, as that is used for const stability checks.
Turning on effects causes ICE with generic args, due to ~const Tr when Tr is not #[const_trait] tripping up expectation in code that handles generic args, more specifically here:

rust/compiler/rustc_hir_analysis/src/astconv/generics.rs

Line 377 in 8681e07

assert_eq!(kind, "lifetime");

We set arg_count.correct to Err to correctly signal that an error has already been reported.

UI test blesses.

Edit(fmease): Fixes #117244 (UI test is in #119099 for now).

r? compiler-errors

compiler-errors · 2023-12-18T20:25:41Z

Could you pull this out into several PRs, or at least several commits that can be reviewed separately? Specifically, I'd like to see:

Changing all the UI tests to feature(effects), and blessing tests (even if some are broken before the next two commits are landed).
Fixing the bug in (2.) above.
Removing the logic around erroring with trait methods.

Thanks!! Sorry for the extra work '^^

compiler/rustc_const_eval/src/transform/check_consts/check.rs

compiler-errors · 2023-12-19T16:18:15Z

compiler/rustc_const_eval/src/transform/check_consts/check.rs

+                            let mut selcx = SelectionContext::new(&infcx);
+                            selcx.select(&obligation)
+                        };
+                        if let Ok(Some(ImplSource::UserDefined(data))) = implsrc {


Instead of just matching on ImplSource::UserDefined, I feel like we should just directly call Instance::resolve here:

if let Ok(Some(func)) = instance && let InstanceDef::Item(def) = func.def { callee = def; }

Maybe also then comment that this is just necessary to select a more specific item for const stability. If the instance-resolve fails, then we'll look at the const stability of the trait item, rather than a more specific impl item.

Why are we still using select here? I don't think it's needed with the Instance::resolve call.

Perhaps I misread your previous comment. I will fix in a moment.

Sorry, no, I wasn't clear. I don't think we need implsrc (or select) at all now, since we can resolve the item here.

compiler-errors · 2023-12-21T15:42:35Z

@rustbot author

One more nit

fee1-dead · 2023-12-22T08:23:50Z

@rustbot ready

compiler-errors · 2023-12-22T18:31:35Z

@bors r+

bors · 2023-12-22T18:31:37Z

📌 Commit df1a4c6 has been approved by compiler-errors

It is now in the queue for this repository.

…=compiler-errors Clean up `check_consts` and misc fixes 1. Remove most of the logic around erroring with trait methods. I have kept the part resolving it to a concrete impl, as that is used for const stability checks. 2. Turning on `effects` causes ICE with generic args, due to `~const Tr` when `Tr` is not `#[const_trait]` tripping up expectation in code that handles generic args, more specifically here: https://github.com/rust-lang/rust/blob/8681e077b8afa99d60acf8f8470a012a3ce709a5/compiler/rustc_hir_analysis/src/astconv/generics.rs#L377 We set `arg_count.correct` to `Err` to correctly signal that an error has already been reported. 3. UI test blesses. Edit(fmease): Fixes rust-lang#117244 (UI test is in rust-lang#119099 for now). r? compiler-errors

…iaskrgr Rollup of 2 pull requests Successful merges: - rust-lang#119072 (Clean up `check_consts` and misc fixes) - rust-lang#119231 (Clairify `ast::PatKind::Struct` presese of `..` by using an enum instead of a bool) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2023-12-23T12:26:25Z

⌛ Testing commit df1a4c6 with merge edcbcc7...

bors · 2023-12-23T14:22:22Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing edcbcc7 to master...

rust-timer · 2023-12-23T16:39:25Z

Finished benchmarking commit (edcbcc7): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -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

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

Binary size

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

Bootstrap: 668.853s -> 669.674s (0.12%)
Artifact size: 312.67 MiB -> 312.80 MiB (0.04%)

fee1-dead marked this pull request as ready for review December 18, 2023 07:51

rustbot assigned compiler-errors Dec 18, 2023

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 18, 2023

fee1-dead added 2 commits December 19, 2023 04:28

bless ui tests

e4f237d

fix ICE when ~const used on non-const trait

324ca87

fee1-dead force-pushed the effects-fixes branch from dd851f7 to 0c6e578 Compare December 19, 2023 04:29

fee1-dead mentioned this pull request Dec 19, 2023

effects: fix a comment #119089

Merged

compiler-errors reviewed Dec 19, 2023

View reviewed changes

fee1-dead force-pushed the effects-fixes branch from 0c6e578 to 7ae2736 Compare December 19, 2023 17:03

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 Dec 21, 2023

fee1-dead force-pushed the effects-fixes branch from 7ae2736 to 357a7f5 Compare December 21, 2023 17:38

This comment has been minimized.

Sign in to view

clean up check_consts checks

df1a4c6

fee1-dead force-pushed the effects-fixes branch from 357a7f5 to df1a4c6 Compare December 22, 2023 08:21

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 Dec 22, 2023

compiler-errors approved these changes Dec 22, 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 Dec 22, 2023

matthiaskrgr mentioned this pull request Dec 23, 2023

Rollup of 2 pull requests #119243

Closed

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

bors merged commit edcbcc7 into rust-lang:master Dec 23, 2023
12 checks passed

rustbot added this to the 1.77.0 milestone Dec 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up `check_consts` and misc fixes #119072

Clean up `check_consts` and misc fixes #119072

fee1-dead commented Dec 18, 2023 •

edited by fmease

Loading

compiler-errors commented Dec 18, 2023 •

edited

Loading

compiler-errors Dec 19, 2023

compiler-errors Dec 19, 2023

fee1-dead Dec 20, 2023

compiler-errors Dec 21, 2023

fee1-dead Dec 21, 2023

compiler-errors Dec 21, 2023

compiler-errors commented Dec 21, 2023

This comment has been minimized.

fee1-dead commented Dec 22, 2023

compiler-errors commented Dec 22, 2023

bors commented Dec 22, 2023

bors commented Dec 23, 2023

bors commented Dec 23, 2023

rust-timer commented Dec 23, 2023

Clean up check_consts and misc fixes #119072

Clean up check_consts and misc fixes #119072

Conversation

fee1-dead commented Dec 18, 2023 • edited by fmease Loading

compiler-errors commented Dec 18, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

compiler-errors commented Dec 21, 2023

This comment has been minimized.

fee1-dead commented Dec 22, 2023

compiler-errors commented Dec 22, 2023

bors commented Dec 22, 2023

bors commented Dec 23, 2023

bors commented Dec 23, 2023

rust-timer commented Dec 23, 2023

Overall result: no relevant changes - no action needed

Clean up `check_consts` and misc fixes #119072

Clean up `check_consts` and misc fixes #119072

fee1-dead commented Dec 18, 2023 •

edited by fmease

Loading

compiler-errors commented Dec 18, 2023 •

edited

Loading