bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Deparameterize Results and ResultsCursor.

Browse source 
They both now only ever contain a `Results<'tcx, A>`.

This means `AnalysisResults` can be removed, as can many
`borrow`/`borrow_mut` calls. Also `Results` no longer needs a
`PhantomData` because `'tcx` is now named by `entry_sets`.
This commit is contained in:
Nicholas Nethercote 2023-11-24 11:28:21 +11:00
parent 34aa36b266
commit e966c89417
5 changed files with 27 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_mir_dataflow/src/framework/engine.rs
View file

@ -5,9 +5,7 @@ use crate::errors::{
};
use crate::framework::BitSetExt;
use std::borrow::Borrow;
use std::ffi::OsString;
use std::marker::PhantomData;
use std::path::PathBuf;
use rustc_ast as ast;
@ -32,31 +30,29 @@ pub type EntrySets<'tcx, A> = IndexVec<BasicBlock, <A as AnalysisDomain<'tcx>>::
/// A dataflow analysis that has converged to fixpoint.
#[derive(Clone)]
pub struct Results<'tcx, A, E = EntrySets<'tcx, A>>
pub struct Results<'tcx, A>
where
A: Analysis<'tcx>,
{
pub analysis: A,
pub(super) entry_sets: E,
pub(super) _marker: PhantomData<&'tcx ()>,
pub(super) entry_sets: EntrySets<'tcx, A>,
}
impl<'tcx, A, E> Results<'tcx, A, E>
impl<'tcx, A> Results<'tcx, A>
where
A: Analysis<'tcx>,
E: Borrow<EntrySets<'tcx, A>>,
{
/// Creates a `ResultsCursor` that can inspect these `Results`.
pub fn into_results_cursor<'mir>(
self,
body: &'mir mir::Body<'tcx>,
) -> ResultsCursor<'mir, 'tcx, A, Self> {
) -> ResultsCursor<'mir, 'tcx, A> {
ResultsCursor::new(body, self)
}
/// Gets the dataflow state for the given block.
pub fn entry_set_for_block(&self, block: BasicBlock) -> &A::Domain {
&self.entry_sets.borrow()[block]
&self.entry_sets[block]
}
pub fn visit_with<'mir>(
@ -242,7 +238,7 @@ where
);
}
let results = Results { analysis, entry_sets, _marker: PhantomData };
let results = Results { analysis, entry_sets };
if tcx.sess.opts.unstable_opts.dump_mir_dataflow {
let (res, results) = write_graphviz_results(tcx, body, results, pass_name);