nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_mir/src/dataflow/move_paths/builder.rs
View File

@ -362,7 +362,7 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
fn gather_terminator(&mut self, term: &Terminator<'tcx>) { fn gather_terminator(&mut self, term: &Terminator<'tcx>) {
match term.kind { match term.kind {
TerminatorKind::Goto { target: _ } TerminatorKind::Goto { target: _ }
| TerminatorKind::FalseEdges { .. } | TerminatorKind::FalseEdge { .. }
| TerminatorKind::FalseUnwind { .. } | TerminatorKind::FalseUnwind { .. }
// In some sense returning moves the return place into the current // In some sense returning moves the return place into the current
// call's destination, however, since there are no statements after // call's destination, however, since there are no statements after

11
compiler/rustc_mir/src/util/graphviz.rs
View File

@ -114,21 +114,16 @@ where
let (blk, bgcolor) = if data.is_cleanup { let (blk, bgcolor) = if data.is_cleanup {
(format!("{} (cleanup)", block.index()), "lightblue") (format!("{} (cleanup)", block.index()), "lightblue")
} else { } else {
let color = if dark_mode { let color = if dark_mode { "dimgray" } else { "gray" };
"dimgray" (format!("{}", block.index()), color)
} else {
"gray"
};
(format!("{}", block.index()), "gray")
}; };
write!( write!(
w, w,
r#"<tr><td bgcolor="{bgcolor}" {attrs} colspan="{colspan}">{blk}</td></tr>"#, r#"<tr><td bgcolor="{bgcolor}" {attrs} colspan="{colspan}">{blk}</td></tr>"#,
bgcolor = if dark_mode { "dimgray" } else { "gray" },
attrs = r#"align="center""#, attrs = r#"align="center""#,
colspan = num_cols, colspan = num_cols,
blk = blk, blk = blk,
color = color bgcolor = bgcolor
)?; )?;
init(w)?; init(w)?;

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