Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Make nrvo-simple set mir-opt-level=1
The additional copies are due to the lack of copy propagation
  • Loading branch information
jonas-schievink committed Sep 18, 2020
1 parent 1649895 commit 8a7b1c3
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 26 deletions.
2 changes: 2 additions & 0 deletions src/test/mir-opt/nrvo-simple.rs
@@ -1,3 +1,5 @@
// compile-flags: -Zmir-opt-level=1

// EMIT_MIR nrvo_simple.nrvo.RenameReturnPlace.diff
fn nrvo(init: fn(&mut [u8; 1024])) -> [u8; 1024] {
let mut buf = [0; 1024];
Expand Down
55 changes: 29 additions & 26 deletions src/test/mir-opt/nrvo_simple.nrvo.RenameReturnPlace.diff
Expand Up @@ -2,39 +2,42 @@
+ // MIR for `nrvo` after RenameReturnPlace

fn nrvo(_1: for<'r> fn(&'r mut [u8; 1024])) -> [u8; 1024] {
debug init => _1; // in scope 0 at $DIR/nrvo-simple.rs:2:9: 2:13
- let mut _0: [u8; 1024]; // return place in scope 0 at $DIR/nrvo-simple.rs:2:39: 2:49
+ let mut _0: [u8; 1024]; // return place in scope 0 at $DIR/nrvo-simple.rs:3:9: 3:16
let mut _2: [u8; 1024]; // in scope 0 at $DIR/nrvo-simple.rs:3:9: 3:16
let _3: (); // in scope 0 at $DIR/nrvo-simple.rs:4:5: 4:19
let mut _4: for<'r> fn(&'r mut [u8; 1024]); // in scope 0 at $DIR/nrvo-simple.rs:4:5: 4:9
let mut _5: &mut [u8; 1024]; // in scope 0 at $DIR/nrvo-simple.rs:4:10: 4:18
let mut _6: &mut [u8; 1024]; // in scope 0 at $DIR/nrvo-simple.rs:4:10: 4:18
debug init => _1; // in scope 0 at $DIR/nrvo-simple.rs:4:9: 4:13
- let mut _0: [u8; 1024]; // return place in scope 0 at $DIR/nrvo-simple.rs:4:39: 4:49
+ let mut _0: [u8; 1024]; // return place in scope 0 at $DIR/nrvo-simple.rs:5:9: 5:16
let mut _2: [u8; 1024]; // in scope 0 at $DIR/nrvo-simple.rs:5:9: 5:16
let _3: (); // in scope 0 at $DIR/nrvo-simple.rs:6:5: 6:19
let mut _4: for<'r> fn(&'r mut [u8; 1024]); // in scope 0 at $DIR/nrvo-simple.rs:6:5: 6:9
let mut _5: &mut [u8; 1024]; // in scope 0 at $DIR/nrvo-simple.rs:6:10: 6:18
let mut _6: &mut [u8; 1024]; // in scope 0 at $DIR/nrvo-simple.rs:6:10: 6:18
scope 1 {
- debug buf => _2; // in scope 1 at $DIR/nrvo-simple.rs:3:9: 3:16
+ debug buf => _0; // in scope 1 at $DIR/nrvo-simple.rs:3:9: 3:16
- debug buf => _2; // in scope 1 at $DIR/nrvo-simple.rs:5:9: 5:16
+ debug buf => _0; // in scope 1 at $DIR/nrvo-simple.rs:5:9: 5:16
}

bb0: {
- StorageLive(_2); // scope 0 at $DIR/nrvo-simple.rs:3:9: 3:16
- _2 = [const 0_u8; 1024]; // scope 0 at $DIR/nrvo-simple.rs:3:19: 3:28
+ _0 = [const 0_u8; 1024]; // scope 0 at $DIR/nrvo-simple.rs:3:19: 3:28
StorageLive(_3); // scope 1 at $DIR/nrvo-simple.rs:4:5: 4:19
StorageLive(_5); // scope 1 at $DIR/nrvo-simple.rs:4:10: 4:18
StorageLive(_6); // scope 1 at $DIR/nrvo-simple.rs:4:10: 4:18
- _6 = &mut _2; // scope 1 at $DIR/nrvo-simple.rs:4:10: 4:18
+ _6 = &mut _0; // scope 1 at $DIR/nrvo-simple.rs:4:10: 4:18
_5 = &mut (*_6); // scope 1 at $DIR/nrvo-simple.rs:4:10: 4:18
_3 = move _1(move _5) -> bb1; // scope 1 at $DIR/nrvo-simple.rs:4:5: 4:19
- StorageLive(_2); // scope 0 at $DIR/nrvo-simple.rs:5:9: 5:16
- _2 = [const 0_u8; 1024]; // scope 0 at $DIR/nrvo-simple.rs:5:19: 5:28
+ _0 = [const 0_u8; 1024]; // scope 0 at $DIR/nrvo-simple.rs:5:19: 5:28
StorageLive(_3); // scope 1 at $DIR/nrvo-simple.rs:6:5: 6:19
StorageLive(_4); // scope 1 at $DIR/nrvo-simple.rs:6:5: 6:9
_4 = _1; // scope 1 at $DIR/nrvo-simple.rs:6:5: 6:9
StorageLive(_5); // scope 1 at $DIR/nrvo-simple.rs:6:10: 6:18
StorageLive(_6); // scope 1 at $DIR/nrvo-simple.rs:6:10: 6:18
- _6 = &mut _2; // scope 1 at $DIR/nrvo-simple.rs:6:10: 6:18
+ _6 = &mut _0; // scope 1 at $DIR/nrvo-simple.rs:6:10: 6:18
_5 = &mut (*_6); // scope 1 at $DIR/nrvo-simple.rs:6:10: 6:18
_3 = move _4(move _5) -> bb1; // scope 1 at $DIR/nrvo-simple.rs:6:5: 6:19
}

bb1: {
StorageDead(_5); // scope 1 at $DIR/nrvo-simple.rs:4:18: 4:19
StorageDead(_6); // scope 1 at $DIR/nrvo-simple.rs:4:19: 4:20
StorageDead(_3); // scope 1 at $DIR/nrvo-simple.rs:4:19: 4:20
- _0 = _2; // scope 1 at $DIR/nrvo-simple.rs:5:5: 5:8
- StorageDead(_2); // scope 0 at $DIR/nrvo-simple.rs:6:1: 6:2
return; // scope 0 at $DIR/nrvo-simple.rs:6:2: 6:2
StorageDead(_5); // scope 1 at $DIR/nrvo-simple.rs:6:18: 6:19
StorageDead(_4); // scope 1 at $DIR/nrvo-simple.rs:6:18: 6:19
StorageDead(_6); // scope 1 at $DIR/nrvo-simple.rs:6:19: 6:20
StorageDead(_3); // scope 1 at $DIR/nrvo-simple.rs:6:19: 6:20
- _0 = _2; // scope 1 at $DIR/nrvo-simple.rs:7:5: 7:8
- StorageDead(_2); // scope 0 at $DIR/nrvo-simple.rs:8:1: 8:2
return; // scope 0 at $DIR/nrvo-simple.rs:8:2: 8:2
}
}

0 comments on commit 8a7b1c3

Please sign in to comment.