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.

Sign up for GitHub

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

Jump to bottom

Stop bubbling out hidden types from the eval obligation queries #112963

Merged
merged 1 commit into from
Jun 24, 2023
Merged

Stop bubbling out hidden types from the eval obligation queries #112963

merged 1 commit into from
Jun 24, 2023

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jun 23, 2023 •
edited

r? @compiler-errors

I don't know why these were added, but they are not needed anymore. The relevant test is unaffected and I didn't see anything interesting in logging that would have justified it.

This PR has no effect on the new solver behaviour of https://github.com/rust-lang/rust/blob/cf2dff2b1e3fa55fa5415d524200070d0d7aacfe/tests/ui/impl-trait/issue-99642.rs (which is overflow) and https://github.com/rust-lang/rust/blob/cf2dff2b1e3fa55fa5415d524200070d0d7aacfe/tests/ui/impl-trait/issue-99642-2.rs (which is "unstable certainty ICE")

@rustbot
Copy link
Collaborator

rustbot commented Jun 23, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @compiler-errors (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot 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 23, 2023
compiler-errors
compiler-errors approved these changes Jun 23, 2023
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New solver doesn't even use evaluate_obligation or type_op_prove_predicate.

@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 23, 2023

📌 Commit c996cfe has been approved by compiler-errors

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 Jun 23, 2023
@compiler-errors compiler-errors mentioned this pull request Jun 24, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 24, 2023
@bors
Auto merge of rust-lang#112987 - compiler-errors:rollup-6anskq1, r=co…
e0ba2d0 
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#111087 (Implement `Sync` for `mpsc::Sender`)
 - rust-lang#112763 (Bump compiler_builtins)
 - rust-lang#112963 (Stop bubbling out hidden types from the eval obligation queries)
 - rust-lang#112965 (Don't emit same goal as input during `wf::unnormalized_obligations`)
 - rust-lang#112973 (Make sure to include default en-US ftl resources for `rustc_error` crate)
 - rust-lang#112981 (Fix return type notation errors with -Zlower-impl-trait-in-trait-to-assoc-ty)
 - rust-lang#112983 (Fix return type notation associated type suggestion when -Zlower-impl-trait-in-trait-to-assoc-ty)
 - rust-lang#112986 (Update cargo)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fdce450 into rust-lang:master Jun 24, 2023
11 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jun 24, 2023
@compiler-errors
Copy link
Member

@rust-timer build 17d3732a5ad1d71698426f1ee59e384246d3f3bd

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (17d3732a5ad1d71698426f1ee59e384246d3f3bd): comparison URL.

Overall result: ❌ regressions - 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.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +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.5% [0.4%, 0.7%] 6
Regressions ❌
(secondary)		 1.3% [1.2%, 1.4%] 6
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.5% [0.4%, 0.7%] 6

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)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -5.8% [-6.9%, -5.2%] 6
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 661.747s -> 662.268s (0.08%)

@rustbot rustbot added the perf-regression Performance regression. label Jun 24, 2023
This was referenced Jul 14, 2023
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2023
@bors
Auto merge of rust-lang#113690 - aliemjay:opaque-defined-by-trait, r=…
b657dc5 
…compiler-errors

allow opaques to be defined by trait queries, again

This basically reverts rust-lang#112963.

Moreover, all call-sites of `enter_canonical_trait_query` can now define opaque types, see the ui test `defined-by-user-annotation.rs`.

Fixes rust-lang#113689

r? `@compiler-errors` `@oli-obk`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@compiler-errors compiler-errors

Labels
perf-regression Performance regression. 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
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@oli-obk @rustbot @compiler-errors @bors @rust-timer