Skip to content

Fix depth check in ProofTreeVisitor. #117878

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

Merged
merged 2 commits into from
Nov 15, 2023
Merged

Conversation

gavinleroy
Copy link
Contributor

@gavinleroy gavinleroy commented Nov 13, 2023

The hack to cutoff overflows and cycles in the new trait solver was incorrect. We want to inspect everything with depth [0..10].

This fix exposed a previously unseen bug, which caused the compiler to ICE when invoking trait_ref on a non-assoc type projection. I simply added the guard in the AmbiguityCausesVisitor, and updated the expected output for the auto-trait-coherence test which now includes the extra note:

   |
   = note: upstream crates may add a new impl of trait `std::marker::Send` for type `OpaqueType` in future versions

r? @lcnr

@rustbot
Copy link
Collaborator

rustbot commented Nov 13, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @lcnr (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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Nov 13, 2023
@rustbot
Copy link
Collaborator

rustbot commented Nov 13, 2023

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@rust-log-analyzer

This comment has been minimized.

…mbiguity of projections. Bless test with more specific notes on the ambiguity cause.
@rustbot
Copy link
Collaborator

rustbot commented Nov 14, 2023

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@lcnr
Copy link
Contributor

lcnr commented Nov 15, 2023

thanks 👍

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 15, 2023

📌 Commit caae1e0 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 Nov 15, 2023
@bors
Copy link
Collaborator

bors commented Nov 15, 2023

⌛ Testing commit caae1e0 with merge 6b771f6...

@bors
Copy link
Collaborator

bors commented Nov 15, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 15, 2023
@bors bors merged commit 6b771f6 into rust-lang:master Nov 15, 2023
@rustbot rustbot added this to the 1.76.0 milestone Nov 15, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6b771f6): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -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.7% [0.5%, 1.0%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.5% [-1.5%, -1.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.0% [-1.5%, 1.0%] 3

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.5% [0.5%, 0.5%] 3
Regressions ❌
(secondary)
1.2% [1.2%, 1.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.5% [0.5%, 0.5%] 3

Binary size

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

Bootstrap: 675.256s -> 674.719s (-0.08%)
Artifact size: 311.08 MiB -> 311.08 MiB (0.00%)

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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants