Skip to content

Track if EvalCtxt has been tainted, make sure it can't be used to make query responses after #110618

New issue

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

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

Already on GitHub? # to your account

Merged
merged 2 commits into from
Apr 21, 2023

Conversation

compiler-errors
Copy link
Member

Just some additional protection against missing probes or strange candidate assembly behavior in the new solver.

For background, we don't ever want to call evaluate_added_goals_and_make_canonical_response if a previous call to try_evaluate_added_goals has bailed with NoSolution, since our nested goals are left in an undefined state at that point. This most commonly suggests a missing EvalCtxt::probe, but could also signify some other shenanigans like dropping a QueryResult on the floor without properly ?'ing it.

r? @lcnr

@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 Apr 20, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 20, 2023

Some changes occurred to the core trait solver

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

@BoxyUwU
Copy link
Member

BoxyUwU commented Apr 20, 2023

r? @BoxyUwU @bors r+ rollup=always

@bors
Copy link
Collaborator

bors commented Apr 20, 2023

📌 Commit 3206100 has been approved by BoxyUwU

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 Apr 20, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 21, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#110365 (ship tools with sysroot)
 - rust-lang#110555 (Substitute missing trait items suggestion correctly)
 - rust-lang#110578 (fix(error): normalize whitespace during msg_to_buffer)
 - rust-lang#110597 (remove unused ftl messages)
 - rust-lang#110611 (Add regression test for rust-lang#46506)
 - rust-lang#110618 (Track if EvalCtxt has been tainted, make sure it can't be used to make query responses after)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 77de5f0 into rust-lang:master Apr 21, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 21, 2023
@compiler-errors compiler-errors deleted the eval-ctxt-tainted branch August 11, 2023 20:00
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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.

5 participants