diff options
| author | varkor <github@varkor.com> | 2018-06-23 16:32:32 +0100 |
|---|---|---|
| committer | varkor <github@varkor.com> | 2018-06-23 18:00:47 +0100 |
| commit | ee7e30f14aa8437294aca766440ef1897d1a5703 (patch) | |
| tree | 01d3650dbf09177a6369b7dbc30bc07f5e7b02fb | |
| parent | dc7d77f88e213214d144643612939d52431396c9 (diff) | |
| download | rust-ee7e30f14aa8437294aca766440ef1897d1a5703.tar.gz rust-ee7e30f14aa8437294aca766440ef1897d1a5703.zip | |
Fix codegen tests
| -rw-r--r-- | src/test/mir-opt/end_region_6.rs | 6 | ||||
| -rw-r--r-- | src/test/mir-opt/end_region_7.rs | 6 | ||||
| -rw-r--r-- | src/test/mir-opt/validate_1.rs | 6 | ||||
| -rw-r--r-- | src/test/mir-opt/validate_5.rs | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/test/mir-opt/end_region_6.rs b/src/test/mir-opt/end_region_6.rs index dadc755eb8c..30ba14c1bab 100644 --- a/src/test/mir-opt/end_region_6.rs +++ b/src/test/mir-opt/end_region_6.rs @@ -68,17 +68,17 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 { // fn main::{{closure}}(_1: [closure@NodeId(22) d:&'19s D]) -> i32 { // let mut _0: i32; // ... -// let _2: &'15_0rs D; +// let _2: &'16_0rs D; // ... // let mut _3: i32; // bb0: { // StorageLive(_2); -// _2 = &'15_0rs (*(_1.0: &'19s D)); +// _2 = &'16_0rs (*(_1.0: &'19s D)); // StorageLive(_3); // _3 = ((*_2).0: i32); // _0 = move _3; // StorageDead(_3); -// EndRegion('15_0rs); +// EndRegion('16_0rs); // StorageDead(_2); // return; // } diff --git a/src/test/mir-opt/end_region_7.rs b/src/test/mir-opt/end_region_7.rs index 1426174b482..6d6afa25ae3 100644 --- a/src/test/mir-opt/end_region_7.rs +++ b/src/test/mir-opt/end_region_7.rs @@ -76,17 +76,17 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 { // fn main::{{closure}}(_1: [closure@NodeId(22) d:D]) -> i32 { // let mut _0: i32; // ... -// let _2: &'15_0rs D; +// let _2: &'16_0rs D; // ... // let mut _3: i32; // bb0: { // StorageLive(_2); -// _2 = &'15_0rs (_1.0: D); +// _2 = &'16_0rs (_1.0: D); // StorageLive(_3); // _3 = ((*_2).0: i32); // _0 = move _3; // StorageDead(_3); -// EndRegion('15_0rs); +// EndRegion('16_0rs); // StorageDead(_2); // drop(_1) -> [return: bb2, unwind: bb1]; // } diff --git a/src/test/mir-opt/validate_1.rs b/src/test/mir-opt/validate_1.rs index e6cd5355000..c331276aade 100644 --- a/src/test/mir-opt/validate_1.rs +++ b/src/test/mir-opt/validate_1.rs @@ -64,14 +64,14 @@ fn main() { // bb0: { // Validate(Acquire, [_1: &ReFree(DefId(0/1:11 ~ validate_1[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(50)], _2: &ReFree(DefId(0/1:11 ~ validate_1[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]); // StorageLive(_3); -// Validate(Suspend(ReScope(Remainder(BlockRemainder { block: ItemLocalId(22), first_statement_index: 0 }))), [(*_2): i32]); +// Validate(Suspend(ReScope(Remainder(BlockRemainder { block: ItemLocalId(25), first_statement_index: 0 }))), [(*_2): i32]); // _3 = &ReErased (*_2); -// Validate(Acquire, [(*_3): i32/ReScope(Remainder(BlockRemainder { block: ItemLocalId(22), first_statement_index: 0 })) (imm)]); +// Validate(Acquire, [(*_3): i32/ReScope(Remainder(BlockRemainder { block: ItemLocalId(25), first_statement_index: 0 })) (imm)]); // StorageLive(_4); // _4 = (*_3); // _0 = move _4; // StorageDead(_4); -// EndRegion(ReScope(Remainder(BlockRemainder { block: ItemLocalId(22), first_statement_index: 0 }))); +// EndRegion(ReScope(Remainder(BlockRemainder { block: ItemLocalId(25), first_statement_index: 0 }))); // StorageDead(_3); // return; // } diff --git a/src/test/mir-opt/validate_5.rs b/src/test/mir-opt/validate_5.rs index d8d83fb5b45..b4d4479bab9 100644 --- a/src/test/mir-opt/validate_5.rs +++ b/src/test/mir-opt/validate_5.rs @@ -53,12 +53,12 @@ fn main() { // StorageLive(_3); // StorageLive(_4); // StorageLive(_5); -// Validate(Suspend(ReScope(Node(ItemLocalId(9)))), [(*_2): i32]); +// Validate(Suspend(ReScope(Node(ItemLocalId(12)))), [(*_2): i32]); // _5 = &ReErased mut (*_2); -// Validate(Acquire, [(*_5): i32/ReScope(Node(ItemLocalId(9)))]); +// Validate(Acquire, [(*_5): i32/ReScope(Node(ItemLocalId(12)))]); // _4 = move _5 as *mut i32 (Misc); // _3 = move _4; -// EndRegion(ReScope(Node(ItemLocalId(9)))); +// EndRegion(ReScope(Node(ItemLocalId(12)))); // StorageDead(_4); // StorageDead(_5); // Validate(Release, [_0: bool, _3: *mut i32]); |
