Allowing re-implementation of mir_drops_elaborated query

[cedihegi]

For our use case of the rust compiler interface (a rust verifier called Prusti), it would be extremely useful if we were able to "copy" the implementation of the mir_drops_elaborated_and_const_checked query to override it. This would mean that the following items would need to be made public:

rust/compiler/rustc_mir_transform/src/lib.rs

Line 434 in 6d55184

fn run_analysis_to_runtime_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {

rust/compiler/rustc_mir_transform/src/inline.rs

Line 32 in 6d55184

pub struct Inline;

(for the latter its module needs to be public or it needs to be re-exported)

To explain why (we think) this is necessary: I am currently working on a new feature, where we try to modify the generated executables by inserting certain additional checks, and potentially perform some optimizations based on verification results.
We are using the rust compiler interface and most of our goals can be achieved by overriding queries, in our case this is currently mir_drops_elaborated_and_const_checked.

However, at the moment this approach is somewhat limited. When overriding queries, we can call and steal the base-query and then modify the results before allocating and returning those.
The problem is that the verification works with a copy of mir_promoted. For the modifications we want to make to the mir, we would often want to rely on results of the verifier that refer to Locations in the mir_promoted. We can not modify the mir_promoted query using these results, because to run the verification we also need the results of mir_borrowck(), which means mir_promoted will already be constructed and cached.
The Locations we get from the verifier are also no longer usable to modify mir_drops_elaborated_and_const_checked, because the MIR obviously changes between those 2 phases. Tracking all Locations between the two seems to be pretty much unfeasible, and would also be extremely unstable.

By being able to override the query with its original implementation, we could modify the MIR before drop elaboration and the various other passes are performed.

I have spent quite a bit of time investigating other solutions, and didn't find any other way solving this problem. If I still missed something I would of course be happy to hear any suggestions that do not require exposing more internal compiler functionality. However, I think being able to re-implement certain queries could also benefit other use cases in the future, for example in PR #108328 one of the approaches discussed involved doing the same thing for mir_promoted.

[rustbot]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (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]

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

[oli-obk]

Please add a comment that this is public so that custom rustc drivers can overwrite the mir_drops_elaborated and run its steps itself.

[oli-obk]

r? @oli-obk

@bors r+ rollup

[bors]

📌 Commit 0166092 has been approved by oli-obk

It is now in the queue for this repository.