Some more refactorings towards removing driver queries #132410
+228
−195
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-query-system
|
The Miri subtree was changed cc @rust-lang/miri |
|
Probably compat relnotes for custom drivers? |
bjorn3
force-pushed
the
yet_another_driver_refactor_round
branch
from
b17abaa
to
aaf0567
Compare
Custom drivers are unstable and by the time we get release notes all custom drivers that are still maintained will have updated already for at least a month. If you are writing a custom driver you have to be looking for PR's when something breaks anyway. |
This comment has been minimized.
This comment has been minimized.
bjorn3
force-pushed
the
yet_another_driver_refactor_round
branch
from
aaf0567
to
86b0254
Compare
This comment has been minimized.
This comment has been minimized.
bjorn3
force-pushed
the
yet_another_driver_refactor_round
branch
from
86b0254
to
c2423f3
Compare
This comment has been minimized.
This comment has been minimized.
bjorn3
force-pushed
the
yet_another_driver_refactor_round
branch
from
c2423f3
to
7e7a344
Compare
This comment has been minimized.
This comment has been minimized.
bjorn3
force-pushed
the
yet_another_driver_refactor_round
branch
from
7e7a344
to
a30d62f
Compare
This comment has been minimized.
This comment has been minimized.
bjorn3
force-pushed
the
yet_another_driver_refactor_round
branch
2 times, most recently
from
5bc8708
to
dd67650
Compare
This allows simplifying the call site and make_input by using a single match instead of two levels of if's.
This allows re-entrant entering of the GlobalCtxt
We now only exit the GlobalCtxt when calling a callback and all the way at the end when the GlobalCtxt is about to be destroyed.
bjorn3
force-pushed
the
yet_another_driver_refactor_round
branch
from
dd67650
to
74fdbb7
Compare
This comment has been minimized.
This comment has been minimized.
There is no other query that may need to be called at that point anyway.
Several custom drivers are incorrectly calling queries.global_ctxt() from inside of it, which causes some driver code to be skipped. As such I would like to either remove it in the future or if custom drivers still need it, change it to accept an &rustc_ast::Crate instead.
bjorn3
force-pushed
the
yet_another_driver_refactor_round
branch
from
74fdbb7
to
159ba4c
Compare
Closed
|
@bors r=cjgillot |
bors
added
S-waiting-on-bors
joboet
added a commit
to joboet/rust
that referenced
this pull request
Nov 27, 2024
…_round, r=cjgillot Some more refactorings towards removing driver queries Follow up to rust-lang#127184 ## Custom driver breaking change The `after_analysis` callback is changed to accept `TyCtxt` instead of `Queries`. The only safe query in `Queries` to call at this point is `global_ctxt()` which allows you to enter the `TyCtxt` either way. To fix your custom driver, replace the `queries: &'tcx Queries<'tcx>` argument with `tcx: TyCtxt<'tcx>` and remove your `queries.global_ctxt().unwrap().enter(|tcx| { ... })` call and only keep the contents of the closure. ## Custom driver deprecation The `after_crate_root_parsing` callback is now deprecated. Several custom drivers are incorrectly calling `queries.global_ctxt()` from inside of it, which causes some driver code to be skipped. As such I would like to either remove it in the future or if custom drivers still need it, change it to accept an `&rustc_ast::Crate` instead.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up to #127184
Custom driver breaking change
The
after_analysiscallback is changed to acceptTyCtxtinstead ofQueries. The only safe query inQueriesto call at this point isglobal_ctxt()which allows you to enter theTyCtxteither way. To fix your custom driver, replace thequeries: &'tcx Queries<'tcx>argument withtcx: TyCtxt<'tcx>and remove yourqueries.global_ctxt().unwrap().enter(|tcx| { ... })call and only keep the contents of the closure.Custom driver deprecation
The
after_crate_root_parsingcallback is now deprecated. Several custom drivers are incorrectly callingqueries.global_ctxt()from inside of it, which causes some driver code to be skipped. As such I would like to either remove it in the future or if custom drivers still need it, change it to accept an&rustc_ast::Crateinstead.