bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Split critical edge targeting the start block

Browse source
This commit is contained in:
Tomasz Miąsko 2021-08-17 00:00:00 +00:00
parent d83da1d05d
commit 9a0ee05c3d
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_mir/src/transform/add_call_guards.rs
View file

@ -38,7 +38,9 @@ impl<'tcx> MirPass<'tcx> for AddCallGuards {
impl AddCallGuards { impl AddCallGuards {
pub fn add_call_guards(&self, body: &mut Body<'_>) { pub fn add_call_guards(&self, body: &mut Body<'_>) {
let pred_count: IndexVec<_, _> = body.predecessors().iter().map(|ps| ps.len()).collect(); let mut pred_count: IndexVec<_, _> =
body.predecessors().iter().map(|ps| ps.len()).collect();
pred_count[START_BLOCK] += 1;
// We need a place to store the new blocks generated // We need a place to store the new blocks generated
let mut new_blocks = Vec::new(); let mut new_blocks = Vec::new();

10
src/test/ui/codegen/issue-88043-bb-does-not-have-terminator.rs
View file

@ -22,4 +22,14 @@ fn take_until(terminate: impl Fn() -> bool) {
// CHECK-LABEL: @main // CHECK-LABEL: @main
fn main() { fn main() {
take_until(|| true); take_until(|| true);
f(None);
} }
fn f(_a: Option<String>) -> Option<u32> {
loop {
g();
()
}
}
fn g() -> Option<u32> { None }