make `compare_const_impl` a query and use it in `instance.rs` #98496

BoxyUwU · 2022-06-25T18:55:21Z

the bug in #88365 was caused by some instance.rs code using the PartialEq impl on Ty to check that the type of the associated const in an impl is the same as the type of the associated const in the trait definition. This was wrong for two reasons:

the check typeck does is that the impl type is a subtype of the trait definition's type (see mismatched_impl_ty_2.rs which was ICEing before this PR on stable)
it assumes that if two types are equal then the PartialEq impl will reflect that which isnt true for higher ranked types or type level constants when feature(generic_const_exprs) is enabled (see mismatched_impl_ty_3.rs for higher ranked types which was ICEing on stable)

r? @lcnr

lcnr · 2022-06-25T19:00:52Z

@bors try @rust-timer queue

rust-timer · 2022-06-25T19:00:53Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2022-06-25T19:01:00Z

⌛ Trying commit e616802befd6814f6a9c41d87f271e61aaf53da5 with merge f99589b0312bfdb02699eab496c80e3446034f1a...

bors · 2022-06-25T19:19:17Z

💔 Test failed - checks-actions

compiler/rustc_middle/src/query/mod.rs

bors · 2022-07-05T18:26:35Z

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

BoxyUwU · 2022-09-30T17:33:21Z

Seems like none of the repro's for this PR ice anymore on master... I am not sure what PR changed this but I can only assume it was by accident since error: erroneous constant encountered with no other explanation is Not really any kind of error message at all. This PR now only gives good errors instead of fixing ICEs 😅

BoxyUwU · 2022-10-01T20:15:57Z

@bors try @rust-timer queue

rust-timer · 2022-10-01T20:15:59Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2022-10-01T20:16:06Z

⌛ Trying commit 611db1d with merge 7b04892a1d61b0d2c6f2826177df092d7ae02bca...

bors · 2022-10-01T21:41:07Z

☀️ Try build successful - checks-actions
Build commit: 7b04892a1d61b0d2c6f2826177df092d7ae02bca (7b04892a1d61b0d2c6f2826177df092d7ae02bca)

rust-timer · 2022-10-01T21:41:08Z

Queued 7b04892a1d61b0d2c6f2826177df092d7ae02bca with parent 56a35bc, future comparison URL.

rust-timer · 2022-10-02T03:48:04Z

Finished benchmarking commit (7b04892a1d61b0d2c6f2826177df092d7ae02bca): 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-review -S-waiting-on-perf -perf-regression

Instruction count

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

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)	-	-	0
Improvements ✅ (secondary)	-2.7%	[-2.8%, -2.6%]	2
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.8%	[2.8%, 2.8%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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

lcnr

small nits, then r=me

compiler/rustc_hir_analysis/src/check/check.rs

compiler/rustc_hir_analysis/src/check/compare_method.rs

lcnr · 2022-10-06T06:37:25Z

@bors r+

bors · 2022-10-06T06:37:27Z

📌 Commit 25ed5d5 has been approved by lcnr

It is now in the queue for this repository.

lcnr · 2022-10-06T06:37:35Z

@bors rollup

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#98496 (make `compare_const_impl` a query and use it in `instance.rs`) - rust-lang#102680 (Fix overconstrained Send impls in btree internals) - rust-lang#102718 (Fix `opaque_hidden_inferred_bound` lint ICE) - rust-lang#102725 (Remove `-Ztime`) - rust-lang#102736 (Migrate search input color to CSS variable) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned lcnr Jun 25, 2022

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

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

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 25, 2022

This comment has been minimized.

Sign in to view

bors 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 Jun 25, 2022

This comment has been minimized.

Sign in to view

cjgillot reviewed Jun 26, 2022

View reviewed changes

compiler/rustc_middle/src/query/mod.rs Outdated Show resolved Hide resolved

lcnr removed the I-types-nominated Nominated for discussion during a types team meeting. label Jun 28, 2022

BoxyUwU added 2 commits September 30, 2022 17:47

make compare_const_impl a query and use it in instance.rs

86a8a3b

bless

831f440

BoxyUwU force-pushed the instancers_bad_equality branch from 04f88ab to 831f440 Compare September 30, 2022 16:57

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

BoxyUwU added 2 commits September 30, 2022 18:53

make query take (LocalDefId, DefId)

c1a9cf4

remove unnecessary Key impl

611db1d

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 1, 2022

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Oct 2, 2022

BoxyUwU removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 2, 2022

lcnr reviewed Oct 3, 2022

View reviewed changes

compiler/rustc_hir_analysis/src/check/check.rs Outdated Show resolved Hide resolved

compiler/rustc_hir_analysis/src/check/compare_method.rs Outdated Show resolved Hide resolved

reviews

25ed5d5

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

matthiaskrgr mentioned this pull request Oct 6, 2022

Rollup of 5 pull requests #102741

Merged

bors merged commit dd0fa6f into rust-lang:master Oct 6, 2022

rustbot added this to the 1.66.0 milestone Oct 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

make `compare_const_impl` a query and use it in `instance.rs` #98496

make `compare_const_impl` a query and use it in `instance.rs` #98496

BoxyUwU commented Jun 25, 2022

lcnr commented Jun 25, 2022

rust-timer commented Jun 25, 2022

bors commented Jun 25, 2022

This comment has been minimized.

bors commented Jun 25, 2022

This comment has been minimized.

bors commented Jul 5, 2022

BoxyUwU commented Sep 30, 2022

BoxyUwU commented Oct 1, 2022

rust-timer commented Oct 1, 2022

bors commented Oct 1, 2022

bors commented Oct 1, 2022

rust-timer commented Oct 1, 2022

rust-timer commented Oct 2, 2022

lcnr left a comment

lcnr commented Oct 6, 2022

bors commented Oct 6, 2022

lcnr commented Oct 6, 2022

make compare_const_impl a query and use it in instance.rs #98496

make compare_const_impl a query and use it in instance.rs #98496

Conversation

BoxyUwU commented Jun 25, 2022

lcnr commented Jun 25, 2022

rust-timer commented Jun 25, 2022

bors commented Jun 25, 2022

This comment has been minimized.

bors commented Jun 25, 2022

This comment has been minimized.

bors commented Jul 5, 2022

BoxyUwU commented Sep 30, 2022

BoxyUwU commented Oct 1, 2022

rust-timer commented Oct 1, 2022

bors commented Oct 1, 2022

bors commented Oct 1, 2022

rust-timer commented Oct 1, 2022

rust-timer commented Oct 2, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

lcnr left a comment

Choose a reason for hiding this comment

lcnr commented Oct 6, 2022

bors commented Oct 6, 2022

lcnr commented Oct 6, 2022

make `compare_const_impl` a query and use it in `instance.rs` #98496

make `compare_const_impl` a query and use it in `instance.rs` #98496