bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert "Address review comments"

Browse source 
This reverts commit b998497bd4.
This commit is contained in:
Felix S. Klock II 2020-06-04 11:27:25 -04:00
parent 2a5cbb0e42
commit bbe1bc4a08
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_mir/dataflow/move_paths/builder.rs
View file

@ -362,16 +362,12 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
fn gather_terminator(&mut self, term: &Terminator<'tcx>) {
match term.kind {
TerminatorKind::Goto { target: _ }
| TerminatorKind::FalseEdges { .. }
| TerminatorKind::FalseUnwind { .. }
// In some sense returning moves the return place into the current
// call's destination, however, since there are no statements after
// this that could possibly access the return place, this doesn't
// need recording.
| TerminatorKind::Return
| TerminatorKind::Resume
| TerminatorKind::Abort
| TerminatorKind::GeneratorDrop
| TerminatorKind::FalseEdges { .. }
| TerminatorKind::FalseUnwind { .. }
| TerminatorKind::Unreachable => {}
TerminatorKind::Assert { ref cond, .. } => {

10
src/librustc_mir_build/build/scope.rs
View file

@ -69,7 +69,7 @@ scheduled in a [DropTree]. Later, before `in_breakable_scope` exits, the drops
will be added to the CFG.
Panics are handled in a similar fashion, except that the drops are added to the
MIR once the rest of the function has finished being lowered. If a terminator
mir once the rest of the function has finished being lowered. If a terminator
can panic, call `diverge_from(block)` with the block containing the terminator
`block`.
@ -284,8 +284,8 @@ impl DropTree {
blocks: &mut IndexVec<DropIdx, Option<BasicBlock>>,
) {
// StorageDead statements can share blocks with each other and also with
// a Drop terminator. We iterate through the drops to find which drops
// need their own block.
// a Drop terminator. We iterate through the blocks to find which blocks
// need
#[derive(Clone, Copy)]
enum Block {
// This drop is unreachable
@ -294,7 +294,7 @@ impl DropTree {
// specified index.
Shares(DropIdx),
// This drop has more than one way of being reached, or it is
// branched to from outside the tree, or its predecessor is a
// branched to from outside the tree, or it's predecessor is a
// `Value` drop.
Own,
}
@ -307,7 +307,7 @@ impl DropTree {
needs_block[ROOT_NODE] = Block::Own;
}
// Sort so that we only need to check the last value.
// Sort so that we only need to check the last
let entry_points = &mut self.entry_points;
entry_points.sort();