mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid predecessors having Drop impls

Browse source
This commit is contained in:
Mark Rousskov 2021-05-07 21:00:03 -04:00
parent 467253ff6a
commit 0367e24f94
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_middle/src/mir/mod.rs
View file

@ -461,7 +461,7 @@ impl<'tcx> Body<'tcx> {
} }
#[inline] #[inline]
pub fn predecessors(&self) -> impl std::ops::Deref<Target = Predecessors> + '_ { pub fn predecessors(&self) -> &Predecessors {
self.predecessor_cache.compute(&self.basic_blocks) self.predecessor_cache.compute(&self.basic_blocks)
} }
@ -2815,13 +2815,13 @@ impl<'a, 'b> graph::GraphSuccessors<'b> for Body<'a> {
impl graph::GraphPredecessors<'graph> for Body<'tcx> { impl graph::GraphPredecessors<'graph> for Body<'tcx> {
type Item = BasicBlock; type Item = BasicBlock;
type Iter = smallvec::IntoIter<[BasicBlock; 4]>; type Iter = std::iter::Copied<std::slice::Iter<'graph, BasicBlock>>;
} }
impl graph::WithPredecessors for Body<'tcx> { impl graph::WithPredecessors for Body<'tcx> {
#[inline] #[inline]
fn predecessors(&self, node: Self::Node) -> <Self as graph::GraphPredecessors<'_>>::Iter { fn predecessors(&self, node: Self::Node) -> <Self as graph::GraphPredecessors<'_>>::Iter {
self.predecessors()[node].clone().into_iter() self.predecessors()[node].iter().copied()
} }
} }

4
compiler/rustc_mir/src/transform/coverage/graph.rs
View file

@ -269,13 +269,13 @@ impl graph::WithSuccessors for CoverageGraph {
impl graph::GraphPredecessors<'graph> for CoverageGraph { impl graph::GraphPredecessors<'graph> for CoverageGraph {
type Item = BasicCoverageBlock; type Item = BasicCoverageBlock;
type Iter = std::vec::IntoIter<BasicCoverageBlock>; type Iter = std::iter::Copied<std::slice::Iter<'graph, BasicCoverageBlock>>;
} }
impl graph::WithPredecessors for CoverageGraph { impl graph::WithPredecessors for CoverageGraph {
#[inline] #[inline]
fn predecessors(&self, node: Self::Node) -> <Self as graph::GraphPredecessors<'_>>::Iter { fn predecessors(&self, node: Self::Node) -> <Self as graph::GraphPredecessors<'_>>::Iter {
self.predecessors[node].clone().into_iter() self.predecessors[node].iter().copied()
} }
} }