Some more refactorings towards removing driver queries #132410

bjorn3 · 2024-10-31T16:12:51Z

Follow up to #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.

rustbot · 2024-10-31T16:13:01Z

r? @pnkfelix

rustbot has assigned @pnkfelix.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-10-31T16:13:03Z

The Miri subtree was changed

cc @rust-lang/miri

jieyouxu · 2024-10-31T16:22:43Z

Probably compat relnotes for custom drivers?

bjorn3 · 2024-10-31T16:42:03Z

Probably compat relnotes for custom drivers?

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 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.

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.

cjgillot

Just a nit and r=me

compiler/rustc_driver_impl/src/lib.rs

bjorn3 · 2024-11-27T10:57:47Z

@bors r=cjgillot

bors · 2024-11-27T10:57:49Z

📌 Commit dc65c63 has been approved by cjgillot

It is now in the queue for this repository.

…_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.

Rollup of 6 pull requests Successful merges: - rust-lang#116161 (Stabilize `extended_varargs_abi_support`) - rust-lang#132410 (Some more refactorings towards removing driver queries) - rust-lang#133418 (coverage: Store coverage source regions as `Span` until codegen) - rust-lang#133498 (Add missing code examples on `LocalKey`) - rust-lang#133518 (Structurally resolve before checking `!` in HIR typeck) - rust-lang#133521 (Structurally resolve before matching on type of projection) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#132410 (Some more refactorings towards removing driver queries) - rust-lang#133418 (coverage: Store coverage source regions as `Span` until codegen) - rust-lang#133498 (Add missing code examples on `LocalKey`) - rust-lang#133518 (Structurally resolve before checking `!` in HIR typeck) - rust-lang#133521 (Structurally resolve before matching on type of projection) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#132410 - bjorn3:yet_another_driver_refactor_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.

A bunch of cleanups These are all extracted from a branch I have to get rid of driver queries. Most of the commits are not directly necessary for this, but were found in the process of implementing the removal of driver queries. Previous PR: rust-lang#132410

Rollup merge of rust-lang#133567 - bjorn3:various_cleanups, r=cjgillot A bunch of cleanups These are all extracted from a branch I have to get rid of driver queries. Most of the commits are not directly necessary for this, but were found in the process of implementing the removal of driver queries. Previous PR: rust-lang#132410

A bunch of cleanups These are all extracted from a branch I have to get rid of driver queries. Most of the commits are not directly necessary for this, but were found in the process of implementing the removal of driver queries. Previous PR: rust-lang/rust#132410

Upgrade toolchain to 12/09. Culprit PRs: - rust-lang/rust#132410 - rust-lang/rust#133746 - Unnecessary `map_or` [clippy lint](https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_map_or) As with previous toolchain upgrades, it's unclear why the LLBC tests regressed. Resolves #3754 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

A bunch of cleanups These are all extracted from a branch I have to get rid of driver queries. Most of the commits are not directly necessary for this, but were found in the process of implementing the removal of driver queries. Previous PR: rust-lang/rust#132410

…l, r=oli-obk Stop using driver queries in the public API Follow up to rust-lang#132410 and rust-lang#133567 The next PR will completely get rid of driver queries. That PR will also contains some non-trivial refactorings enabled by no longer needing to support entering TyCtxt multiple times after it is constructed. The changes in the current PR have been split out to make it easier to review the api changes and to reduce the size of the next PR to review. ## Custom driver breaking change The `after_crate_root_parsing` and `after_expansion` callbacks now accept `ast::Crate` and `TyCtxt` respectively rather than `Queries`. The only safe query in `Queries` to call inside these callbacks are `parse()` and `global_ctxt()` respectively which allows you to access the `ast::Crate` and `TyCtxt` either way. To fix your custom driver, replace the `queries: &'tcx Queries<'tcx>` argument with `crate_: ast::Crate` and `tcx: TyCtxt<'tcx>` respectively and for `after_expansion` remove your `queries.global_ctxt().unwrap().enter(|tcx| { ... })` call and only keep the contents of the closure.

Rollup merge of rust-lang#134130 - bjorn3:prepare_driver_query_removal, r=oli-obk Stop using driver queries in the public API Follow up to rust-lang#132410 and rust-lang#133567 The next PR will completely get rid of driver queries. That PR will also contains some non-trivial refactorings enabled by no longer needing to support entering TyCtxt multiple times after it is constructed. The changes in the current PR have been split out to make it easier to review the api changes and to reduce the size of the next PR to review. ## Custom driver breaking change The `after_crate_root_parsing` and `after_expansion` callbacks now accept `ast::Crate` and `TyCtxt` respectively rather than `Queries`. The only safe query in `Queries` to call inside these callbacks are `parse()` and `global_ctxt()` respectively which allows you to access the `ast::Crate` and `TyCtxt` either way. To fix your custom driver, replace the `queries: &'tcx Queries<'tcx>` argument with `crate_: ast::Crate` and `tcx: TyCtxt<'tcx>` respectively and for `after_expansion` remove your `queries.global_ctxt().unwrap().enter(|tcx| { ... })` call and only keep the contents of the closure.

rustbot assigned pnkfelix Oct 31, 2024

bjorn3 force-pushed the yet_another_driver_refactor_round branch from b17abaa to aaf0567 Compare October 31, 2024 16:35