Revert: create const block bodies in typeck via query feeding #125918

oli-obk · 2024-06-03T09:15:22Z

as per the discussion in #125806 (comment)

It was a mistake to try to shoehorn const blocks and some specific anon consts into the same box and feed them during typeck. It turned out not simplifying anything (my hope was that we could feed type_of to start avoiding the huge HIR matcher, but that didn't work out), but instead making a few things more fragile.

reverts the const-block-specific parts of #124650

@bors rollup=never had a small perf impact previously

fixes #125846

r? @compiler-errors

rustbot · 2024-06-03T09:15:32Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in match checking

cc @Nadrieril

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

compiler-errors · 2024-06-03T12:08:41Z

@bors r+

bors · 2024-06-03T12:08:44Z

📌 Commit 0d88bf2 has been approved by compiler-errors

It is now in the queue for this repository.

…r-errors Revert: create const block bodies in typeck via query feeding as per the discussion in rust-lang#125806 (comment) It was a mistake to try to shoehorn const blocks and some specific anon consts into the same box and feed them during typeck. It turned out not simplifying anything (my hope was that we could feed `type_of` to start avoiding the huge HIR matcher, but that didn't work out), but instead making a few things more fragile. reverts the const-block-specific parts of rust-lang#124650 `@bors` rollup=never had a small perf impact previously fixes rust-lang#125846 r? `@compiler-errors`

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#122597 (Show files produced by `--emit foo` in json artifact notifications) - rust-lang#124486 (Add tracking issue and unstable book page for `"vectorcall"` ABI) - rust-lang#125380 (Make `WHERE_CLAUSES_OBJECT_SAFETY` a regular object safety violation) - rust-lang#125690 (ARM Target Docs Update) - rust-lang#125865 (Fix ICE caused by ignoring EffectVars in type inference) - rust-lang#125893 (Handle all GVN binops in a single place.) - rust-lang#125909 (rustdoc: add a regression test for a former blanket impl synthesis ICE) - rust-lang#125918 (Revert: create const block bodies in typeck via query feeding) - rust-lang#125919 (Remove stray "this") r? `@ghost` `@rustbot` modify labels: rollup

…r-errors Revert: create const block bodies in typeck via query feeding as per the discussion in rust-lang#125806 (comment) It was a mistake to try to shoehorn const blocks and some specific anon consts into the same box and feed them during typeck. It turned out not simplifying anything (my hope was that we could feed `type_of` to start avoiding the huge HIR matcher, but that didn't work out), but instead making a few things more fragile. reverts the const-block-specific parts of rust-lang#124650 ``@bors`` rollup=never had a small perf impact previously fixes rust-lang#125846 r? ``@compiler-errors``

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#122597 (Show files produced by `--emit foo` in json artifact notifications) - rust-lang#124486 (Add tracking issue and unstable book page for `"vectorcall"` ABI) - rust-lang#125690 (ARM Target Docs Update) - rust-lang#125865 (Fix ICE caused by ignoring EffectVars in type inference) - rust-lang#125893 (Handle all GVN binops in a single place.) - rust-lang#125909 (rustdoc: add a regression test for a former blanket impl synthesis ICE) - rust-lang#125918 (Revert: create const block bodies in typeck via query feeding) - rust-lang#125919 (Remove stray "this") - rust-lang#125927 (Ignore `vec_deque_alloc_error::test_shrink_to_unwind` test on non-unwind targets) r? `@ghost` `@rustbot` modify labels: rollup

…r-errors Revert: create const block bodies in typeck via query feeding as per the discussion in rust-lang#125806 (comment) It was a mistake to try to shoehorn const blocks and some specific anon consts into the same box and feed them during typeck. It turned out not simplifying anything (my hope was that we could feed `type_of` to start avoiding the huge HIR matcher, but that didn't work out), but instead making a few things more fragile. reverts the const-block-specific parts of rust-lang#124650 ```@bors``` rollup=never had a small perf impact previously fixes rust-lang#125846 r? ```@compiler-errors```

Rollup of 7 pull requests Successful merges: - rust-lang#122192 (Do not try to reveal hidden types when trying to prove Freeze in the defining scope) - rust-lang#124840 (resolve: mark it undetermined if single import is not has any bindings) - rust-lang#125622 (Winnow private method candidates instead of assuming any candidate of the right name will apply) - rust-lang#125871 (Orphanck[old solver]: Consider opaque types to never cover type parameters) - rust-lang#125893 (Handle all GVN binops in a single place.) - rust-lang#125911 (delete bootstrap build before switching to bumped rustc) - rust-lang#125918 (Revert: create const block bodies in typeck via query feeding) r? `@ghost` `@rustbot` modify labels: rollup

workingjubilee · 2024-06-05T08:02:09Z

@bors rollup=never

Rollup of 7 pull requests Successful merges: - rust-lang#122192 (Do not try to reveal hidden types when trying to prove Freeze in the defining scope) - rust-lang#124840 (resolve: mark it undetermined if single import is not has any bindings) - rust-lang#125622 (Winnow private method candidates instead of assuming any candidate of the right name will apply) - rust-lang#125871 (Orphanck[old solver]: Consider opaque types to never cover type parameters) - rust-lang#125893 (Handle all GVN binops in a single place.) - rust-lang#125911 (delete bootstrap build before switching to bumped rustc) - rust-lang#125918 (Revert: create const block bodies in typeck via query feeding) r? `@ghost` `@rustbot` modify labels: rollup

workingjubilee · 2024-06-06T18:35:42Z

revert during beta week.
@bors p=7

…errors Revert: create const block bodies in typeck via query feeding as per the discussion in rust-lang#125806 (comment) It was a mistake to try to shoehorn const blocks and some specific anon consts into the same box and feed them during typeck. It turned out not simplifying anything (my hope was that we could feed `type_of` to start avoiding the huge HIR matcher, but that didn't work out), but instead making a few things more fragile. reverts the const-block-specific parts of rust-lang#124650 `@bors` rollup=never had a small perf impact previously fixes rust-lang#125846 r? `@compiler-errors`

bors · 2024-06-06T19:58:33Z

⌛ Testing commit 0d88bf2 with merge 053f6a9...

bors · 2024-06-06T20:17:36Z

💔 Test failed - checks-actions

This reverts commit eae5031.

This reverts commit ddc5f9b.

oli-obk · 2024-06-07T08:50:35Z

@bors r=compiler-errors

bors · 2024-06-07T08:50:37Z

💡 This pull request was already approved, no need to approve it again.

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
There's another pull request that is currently being tested, blocking this pull request: Rollup of 7 pull requests #126108

bors · 2024-06-07T08:50:38Z

📌 Commit 321d69d has been approved by compiler-errors

It is now in the queue for this repository.

rustbot · 2024-06-07T08:50:39Z

Some changes occurred in tests/codegen/sanitizer

cc @rust-lang/project-exploit-mitigations, @rcvalle

oli-obk · 2024-06-07T08:50:55Z

@bors r=compiler-errors

bors · 2024-06-07T08:50:57Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Rollup of 7 pull requests #126108

bors · 2024-06-07T08:50:57Z

📌 Commit 321d69d has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2024-06-07T09:09:04Z

⌛ Testing commit 321d69d with merge 1be24d7...

bors · 2024-06-07T11:25:19Z

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

rust-timer · 2024-06-07T12:55:42Z

Finished benchmarking commit (1be24d7): 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.3%	[-0.5%, -0.2%]	35
Improvements ✅ (secondary)	-0.4%	[-0.4%, -0.3%]	9
All ❌✅ (primary)	-0.3%	[-0.5%, -0.2%]	35

Max RSS (memory usage)

Results (primary -2.3%)

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)	2.4%	[2.2%, 2.6%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-3.3%	[-6.1%, -0.5%]	9
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.3%	[-6.1%, 2.6%]	11

Cycles

Results (primary -0.8%)

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.8%	[-0.9%, -0.7%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.8%	[-0.9%, -0.7%]	2

Binary size

Results (primary -0.2%, secondary 0.1%)

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.0%	[0.0%, 0.1%]	8
Regressions ❌ (secondary)	0.1%	[0.0%, 0.1%]	37
Improvements ✅ (primary)	-0.2%	[-0.7%, -0.0%]	37
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-0.7%, 0.1%]	45

Bootstrap: missing data
Artifact size: 319.53 MiB -> 319.51 MiB (-0.01%)

…errors Revert: create const block bodies in typeck via query feeding as per the discussion in rust-lang#125806 (comment) It was a mistake to try to shoehorn const blocks and some specific anon consts into the same box and feed them during typeck. It turned out not simplifying anything (my hope was that we could feed `type_of` to start avoiding the huge HIR matcher, but that didn't work out), but instead making a few things more fragile. reverts the const-block-specific parts of rust-lang#124650 `@bors` rollup=never had a small perf impact previously fixes rust-lang#125846 r? `@compiler-errors`

rustbot assigned compiler-errors Jun 3, 2024

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 Jun 3, 2024

oli-obk changed the title ~~Const block ice~~ Revert: create const block bodies in typeck via query feeding Jun 3, 2024

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 Jun 3, 2024

matthiaskrgr mentioned this pull request Jun 3, 2024

Rollup of 9 pull requests #125931

Closed

matthiaskrgr mentioned this pull request Jun 3, 2024

Rollup of 9 pull requests #125938

Closed

fmease mentioned this pull request Jun 4, 2024

Rollup of 7 pull requests #126001

Closed

This comment has been minimized.

Sign in to view

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 Jun 6, 2024

Revert "Cache whether a body has inline consts"

92c54db

This reverts commit eae5031.

oli-obk added 3 commits June 7, 2024 08:33

Revert "Create const block DefIds in typeck instead of ast lowering"

cbee17d

This reverts commit ddc5f9b.

Add regression test

bbcd879

Fix codegen test

321d69d

oli-obk force-pushed the const_block_ice branch from 0d88bf2 to 321d69d Compare June 7, 2024 08:50

rustbot added the PG-exploit-mitigations Project group: Exploit mitigations label Jun 7, 2024

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 Jun 7, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 7, 2024

bors merged commit 1be24d7 into rust-lang:master Jun 7, 2024
7 checks passed

rustbot added this to the 1.80.0 milestone Jun 7, 2024

bors mentioned this pull request Jun 7, 2024

Make create_def a side effect instead of marking the entire query as always red #115613

Open

3 tasks

oli-obk deleted the const_block_ice branch June 7, 2024 13:16

lqd mentioned this pull request Jun 7, 2024

ICE: cannot convert ReLateParam to a region vid #125873

Open

tesuji mentioned this pull request Jun 8, 2024

Don't lint assertions_on_constants on any const assertions rust-lang/rust-clippy#12840

Merged

matthiaskrgr mentioned this pull request Jun 15, 2024

ICE: incr: no entry found for key #126516

Closed

GrigorenkoPV mentioned this pull request Jun 19, 2024

ICE: mir_const_qualif: index out of bounds: the len is 0 but the index is 0 #125837

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revert: create const block bodies in typeck via query feeding #125918

Revert: create const block bodies in typeck via query feeding #125918

oli-obk commented Jun 3, 2024 •

edited

Loading

rustbot commented Jun 3, 2024

compiler-errors commented Jun 3, 2024

bors commented Jun 3, 2024

workingjubilee commented Jun 5, 2024

workingjubilee commented Jun 6, 2024

bors commented Jun 6, 2024

This comment has been minimized.

bors commented Jun 6, 2024

oli-obk commented Jun 7, 2024

bors commented Jun 7, 2024

bors commented Jun 7, 2024

rustbot commented Jun 7, 2024

oli-obk commented Jun 7, 2024

bors commented Jun 7, 2024

bors commented Jun 7, 2024

bors commented Jun 7, 2024

bors commented Jun 7, 2024

rust-timer commented Jun 7, 2024

Revert: create const block bodies in typeck via query feeding #125918

Revert: create const block bodies in typeck via query feeding #125918

Conversation

oli-obk commented Jun 3, 2024 • edited Loading

rustbot commented Jun 3, 2024

compiler-errors commented Jun 3, 2024

bors commented Jun 3, 2024

workingjubilee commented Jun 5, 2024

workingjubilee commented Jun 6, 2024

bors commented Jun 6, 2024

This comment has been minimized.

bors commented Jun 6, 2024

oli-obk commented Jun 7, 2024

bors commented Jun 7, 2024

bors commented Jun 7, 2024

rustbot commented Jun 7, 2024

oli-obk commented Jun 7, 2024

bors commented Jun 7, 2024

bors commented Jun 7, 2024

bors commented Jun 7, 2024

bors commented Jun 7, 2024

rust-timer commented Jun 7, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

oli-obk commented Jun 3, 2024 •

edited

Loading