bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix rebase fallout

Browse source
This commit is contained in:
Aaron Hill 2020-10-02 15:40:24 -04:00
parent 8902ce5d84
commit 4c83eec008
No known key found for this signature in database
GPG key ID: B4087E510E98B164
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_mir_build/src/build/scope.rs
View file

@ -85,7 +85,6 @@ use crate::build::{BlockAnd, BlockAndExtension, BlockFrame, Builder, CFG};
use crate::thir::{Expr, ExprRef, LintLevel};
use rustc_data_structures::fx::FxHashMap;
use rustc_hir as hir;
use rustc_hir::GeneratorKind;
use rustc_index::vec::IndexVec;
use rustc_middle::middle::region;
use rustc_middle::mir::*;
@ -364,7 +363,7 @@ impl DropTree {
target: blocks[drop_data.1].unwrap(),
// The caller will handle this if needed.
unwind: None,
location: drop_data.0.local.into(),
place: drop_data.0.local.into(),
};
cfg.terminate(block, drop_data.0.source_info, terminator);
}
@ -1389,7 +1388,8 @@ impl<'tcx> DropTreeBuilder<'tcx> for Unwind {
| TerminatorKind::Unreachable
| TerminatorKind::Yield { .. }
| TerminatorKind::GeneratorDrop
| TerminatorKind::FalseEdges { .. } => {
| TerminatorKind::FalseEdge { .. }
| TerminatorKind::InlineAsm {.. } => {
span_bug!(term.source_info.span, "cannot unwind from {:?}", term.kind)
}
}