Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Unify tcx.constness and param env constness checks" #103284

Merged
merged 3 commits into from
Oct 26, 2022

Conversation

compiler-errors
Copy link
Member

Too much of a perf regression #102975 (comment), and an attempt in #103263 didn't fix it except for just a tiny bit.

This change isn't really needed (see #102830 (comment)), so this should be an easy revert.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 20, 2022
@rust-highfive
Copy link
Collaborator

r? @davidtwco

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 20, 2022
@rustbot rustbot added the A-testsuite Area: The testsuite used to check the correctness of rustc label Oct 20, 2022
@compiler-errors
Copy link
Member Author

compiler-errors commented Oct 20, 2022

So it turns out that the PR #102830 did have side-effects in the way we generate diagnostics for closure calls in consts, so reverting this is actually a good idea...

The UI test that got blessed in 751ac6c landed after the reverted PR, so that's why we had to bless.

@compiler-errors
Copy link
Member Author

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned davidtwco Oct 20, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Oct 20, 2022

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Oct 20, 2022

📌 Commit 751ac6c has been approved by oli-obk

It is now in the queue for this repository.

@bors 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 20, 2022
@bors
Copy link
Contributor

bors commented Oct 26, 2022

⌛ Testing commit 751ac6c with merge 43dd3d5...

@bors
Copy link
Contributor

bors commented Oct 26, 2022

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 43dd3d5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 26, 2022
@bors bors merged commit 43dd3d5 into rust-lang:master Oct 26, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 26, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (43dd3d5): 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.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.4% [-1.0%, -0.2%] 43
Improvements ✅
(secondary)
-1.0% [-2.7%, -0.1%] 36
All ❌✅ (primary) -0.4% [-1.0%, -0.2%] 43

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.

mean1 range count2
Regressions ❌
(primary)
1.2% [1.2%, 1.2%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.9% [-0.9%, -0.9%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.2% [-0.9%, 1.2%] 2

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.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.8% [-3.3%, -2.0%] 3
All ❌✅ (primary) - - 0

Footnotes

  1. the arithmetic mean of the percent change 2 3

  2. number of relevant changes 2 3

@compiler-errors compiler-errors deleted the const-sad branch November 2, 2022 02:53
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
Revert "Unify tcx.constness and param env constness checks"

Too much of a perf regression rust-lang#102975 (comment), and an attempt in rust-lang#103263 didn't fix it except for just a tiny bit.

This change isn't really needed (see rust-lang#102830 (comment)), so this should be an easy revert.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants