Skip to content

Commit bbe1bc4

Browse files
committed
Revert "Address review comments"
This reverts commit b998497.
1 parent 2a5cbb0 commit bbe1bc4

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/librustc_mir/dataflow/move_paths/builder.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -362,16 +362,12 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
362362
fn gather_terminator(&mut self, term: &Terminator<'tcx>) {
363363
match term.kind {
364364
TerminatorKind::Goto { target: _ }
365-
| TerminatorKind::FalseEdges { .. }
366-
| TerminatorKind::FalseUnwind { .. }
367-
// In some sense returning moves the return place into the current
368-
// call's destination, however, since there are no statements after
369-
// this that could possibly access the return place, this doesn't
370-
// need recording.
371365
| TerminatorKind::Return
372366
| TerminatorKind::Resume
373367
| TerminatorKind::Abort
374368
| TerminatorKind::GeneratorDrop
369+
| TerminatorKind::FalseEdges { .. }
370+
| TerminatorKind::FalseUnwind { .. }
375371
| TerminatorKind::Unreachable => {}
376372

377373
TerminatorKind::Assert { ref cond, .. } => {

src/librustc_mir_build/build/scope.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ scheduled in a [DropTree]. Later, before `in_breakable_scope` exits, the drops
6969
will be added to the CFG.
7070
7171
Panics are handled in a similar fashion, except that the drops are added to the
72-
MIR once the rest of the function has finished being lowered. If a terminator
72+
mir once the rest of the function has finished being lowered. If a terminator
7373
can panic, call `diverge_from(block)` with the block containing the terminator
7474
`block`.
7575
@@ -284,8 +284,8 @@ impl DropTree {
284284
blocks: &mut IndexVec<DropIdx, Option<BasicBlock>>,
285285
) {
286286
// StorageDead statements can share blocks with each other and also with
287-
// a Drop terminator. We iterate through the drops to find which drops
288-
// need their own block.
287+
// a Drop terminator. We iterate through the blocks to find which blocks
288+
// need
289289
#[derive(Clone, Copy)]
290290
enum Block {
291291
// This drop is unreachable
@@ -294,7 +294,7 @@ impl DropTree {
294294
// specified index.
295295
Shares(DropIdx),
296296
// This drop has more than one way of being reached, or it is
297-
// branched to from outside the tree, or its predecessor is a
297+
// branched to from outside the tree, or it's predecessor is a
298298
// `Value` drop.
299299
Own,
300300
}
@@ -307,7 +307,7 @@ impl DropTree {
307307
needs_block[ROOT_NODE] = Block::Own;
308308
}
309309

310-
// Sort so that we only need to check the last value.
310+
// Sort so that we only need to check the last
311311
let entry_points = &mut self.entry_points;
312312
entry_points.sort();
313313

0 commit comments

Comments
 (0)