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

Keep going if normalized projection has unevaluated consts in QueryNormalizer #100315

Merged
merged 2 commits into from
Aug 11, 2022

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Aug 9, 2022

#100312 was the wrong approach, I think this is the right one.

When normalizing a type, if we see that it's a projection, we currently defer to tcx.normalize_projection_ty, which normalizes the projections away but doesn't touch the unevaluated constants. So now we just continue to fold the type if it has unevaluated constants so we make sure to evaluate those too, if we can.

Fixes #100217
Fixes #83972
Fixes #84669
Fixes #86710
Fixes #82268
Fixes #73298

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

r? @oli-obk

(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 Aug 9, 2022
@lcnr
Copy link
Contributor

lcnr commented Aug 9, 2022

r? @lcnr

@rust-highfive rust-highfive assigned lcnr and unassigned oli-obk Aug 9, 2022
@compiler-errors
Copy link
Member Author

@bors r=lcnr rollup=never

@bors
Copy link
Contributor

bors commented Aug 9, 2022

📌 Commit d2667e4 has been approved by lcnr

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

bors commented Aug 11, 2022

⌛ Testing commit d2667e4 with merge aeb5067...

@bors
Copy link
Contributor

bors commented Aug 11, 2022

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing aeb5067 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 11, 2022
@bors bors merged commit aeb5067 into rust-lang:master Aug 11, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 11, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (aeb5067): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: ❌ relevant regression found
mean1 max count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.5% 1.5% 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: ✅ relevant improvement found
mean1 max count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.0% -4.0% 1
All ❌✅ (primary) - - 0

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: ❌ relevant regression found
mean1 max count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.5% 3.5% 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change 2 3

  2. number of relevant changes 2 3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
7 participants