nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove CloneAnalysis.

Browse Source 
It's only implemented for analyses that implement `Copy`, which means
it's basically a complicated synonym for `Copy`. So this commit removes
it and uses `Copy` directly. (That direct use will be removed in a later
commit.)
This commit is contained in:
Nicholas Nethercote 2023-11-23 17:17:52 +11:00
parent 389e2cc69a
commit d957c47183
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/rustc_mir_dataflow/src/framework/engine.rs
View File

@ -24,9 +24,8 @@ use rustc_span::symbol::{sym, Symbol};
use super::fmt::DebugWithContext; use super::fmt::DebugWithContext;
use super::graphviz; use super::graphviz;
use super::{ use super::{
visit_results, Analysis, AnalysisDomain, CloneAnalysis, Direction, GenKill, GenKillAnalysis, visit_results, Analysis, AnalysisDomain, Direction, GenKill, GenKillAnalysis, GenKillSet,
GenKillSet, JoinSemiLattice, ResultsClonedCursor, ResultsCursor, ResultsRefCursor, JoinSemiLattice, ResultsClonedCursor, ResultsCursor, ResultsRefCursor, ResultsVisitor,
ResultsVisitor,
}; };
pub type EntrySets<'tcx, A> = IndexVec<BasicBlock, <A as AnalysisDomain<'tcx>>::Domain>; pub type EntrySets<'tcx, A> = IndexVec<BasicBlock, <A as AnalysisDomain<'tcx>>::Domain>;
@ -96,23 +95,15 @@ where
impl<'tcx, A> Results<'tcx, A> impl<'tcx, A> Results<'tcx, A>
where where
A: Analysis<'tcx> + CloneAnalysis, A: Analysis<'tcx> + Copy,
{ {
/// Creates a new `Results` type with a cloned `Analysis` and borrowed entry sets.
pub fn clone_analysis(&self) -> ResultsCloned<'_, 'tcx, A> {
Results {
analysis: self.analysis.clone_analysis(),
entry_sets: &self.entry_sets,
_marker: PhantomData,
}
}
/// Creates a `ResultsCursor` that can inspect these `Results`. /// Creates a `ResultsCursor` that can inspect these `Results`.
pub fn cloned_results_cursor<'mir>( pub fn cloned_results_cursor<'mir>(
&self, &self,
body: &'mir mir::Body<'tcx>, body: &'mir mir::Body<'tcx>,
) -> ResultsClonedCursor<'_, 'mir, 'tcx, A> { ) -> ResultsClonedCursor<'_, 'mir, 'tcx, A> {
self.clone_analysis().into_results_cursor(body) Results { analysis: self.analysis, entry_sets: &self.entry_sets, _marker: PhantomData }
.into_results_cursor(body)
} }
} }

15
compiler/rustc_mir_dataflow/src/framework/mod.rs
View File

@ -246,21 +246,6 @@ pub trait Analysis<'tcx>: AnalysisDomain<'tcx> {
} }
} }
/// Defines an `Analysis` which can be cloned for use in multiple `ResultsCursor`s or
/// `ResultsVisitor`s. Note this need not be a full clone, only enough of one to be used with a new
/// `ResultsCursor` or `ResultsVisitor`
pub trait CloneAnalysis {
fn clone_analysis(&self) -> Self;
}
impl<'tcx, A> CloneAnalysis for A
where
A: Analysis<'tcx> + Copy,
{
fn clone_analysis(&self) -> Self {
*self
}
}
/// A gen/kill dataflow problem. /// A gen/kill dataflow problem.
/// ///
/// Each method in this trait has a corresponding one in `Analysis`. However, these methods only /// Each method in this trait has a corresponding one in `Analysis`. However, these methods only