Skip to content

Commit

Permalink
./x.py test --bless
Browse files Browse the repository at this point in the history
  • Loading branch information
tmiasko committed Nov 12, 2020
1 parent 79d853e commit 2a010dd
Show file tree
Hide file tree
Showing 6 changed files with 184 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
+ // MIR for `inlined_no_sanitize` after Inline

fn inlined_no_sanitize() -> () {
let mut _0: (); // return place in scope 0 at $DIR/inline-compatibility.rs:24:37: 24:37
let _1: (); // in scope 0 at $DIR/inline-compatibility.rs:25:5: 25:18
+ scope 1 (inlined no_sanitize) { // at $DIR/inline-compatibility.rs:25:5: 25:18
let mut _0: (); // return place in scope 0 at $DIR/inline-compatibility.rs:23:37: 23:37
let _1: (); // in scope 0 at $DIR/inline-compatibility.rs:24:5: 24:18
+ scope 1 (inlined no_sanitize) { // at $DIR/inline-compatibility.rs:24:5: 24:18
+ }

bb0: {
StorageLive(_1); // scope 0 at $DIR/inline-compatibility.rs:25:5: 25:18
- _1 = no_sanitize() -> bb1; // scope 0 at $DIR/inline-compatibility.rs:25:5: 25:18
StorageLive(_1); // scope 0 at $DIR/inline-compatibility.rs:24:5: 24:18
- _1 = no_sanitize() -> bb1; // scope 0 at $DIR/inline-compatibility.rs:24:5: 24:18
- // mir::Constant
- // + span: $DIR/inline-compatibility.rs:25:5: 25:16
- // + span: $DIR/inline-compatibility.rs:24:5: 24:16
- // + literal: Const { ty: unsafe fn() {no_sanitize}, val: Value(Scalar(<ZST>)) }
- }
-
- bb1: {
+ _1 = const (); // scope 1 at $DIR/inline-compatibility.rs:25:5: 25:18
StorageDead(_1); // scope 0 at $DIR/inline-compatibility.rs:25:18: 25:19
_0 = const (); // scope 0 at $DIR/inline-compatibility.rs:24:37: 26:2
return; // scope 0 at $DIR/inline-compatibility.rs:26:2: 26:2
+ _1 = const (); // scope 1 at $DIR/inline-compatibility.rs:24:5: 24:18
StorageDead(_1); // scope 0 at $DIR/inline-compatibility.rs:24:18: 24:19
_0 = const (); // scope 0 at $DIR/inline-compatibility.rs:23:37: 25:2
return; // scope 0 at $DIR/inline-compatibility.rs:25:2: 25:2
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
+ // MIR for `inlined_target_feature` after Inline

fn inlined_target_feature() -> () {
let mut _0: (); // return place in scope 0 at $DIR/inline-compatibility.rs:13:40: 13:40
let _1: (); // in scope 0 at $DIR/inline-compatibility.rs:14:5: 14:21
+ scope 1 (inlined target_feature) { // at $DIR/inline-compatibility.rs:14:5: 14:21
let mut _0: (); // return place in scope 0 at $DIR/inline-compatibility.rs:12:40: 12:40
let _1: (); // in scope 0 at $DIR/inline-compatibility.rs:13:5: 13:21
+ scope 1 (inlined target_feature) { // at $DIR/inline-compatibility.rs:13:5: 13:21
+ }

bb0: {
StorageLive(_1); // scope 0 at $DIR/inline-compatibility.rs:14:5: 14:21
- _1 = target_feature() -> bb1; // scope 0 at $DIR/inline-compatibility.rs:14:5: 14:21
StorageLive(_1); // scope 0 at $DIR/inline-compatibility.rs:13:5: 13:21
- _1 = target_feature() -> bb1; // scope 0 at $DIR/inline-compatibility.rs:13:5: 13:21
- // mir::Constant
- // + span: $DIR/inline-compatibility.rs:14:5: 14:19
- // + span: $DIR/inline-compatibility.rs:13:5: 13:19
- // + literal: Const { ty: unsafe fn() {target_feature}, val: Value(Scalar(<ZST>)) }
- }
-
- bb1: {
+ _1 = const (); // scope 1 at $DIR/inline-compatibility.rs:14:5: 14:21
StorageDead(_1); // scope 0 at $DIR/inline-compatibility.rs:14:21: 14:22
_0 = const (); // scope 0 at $DIR/inline-compatibility.rs:13:40: 15:2
return; // scope 0 at $DIR/inline-compatibility.rs:15:2: 15:2
+ _1 = const (); // scope 1 at $DIR/inline-compatibility.rs:13:5: 13:21
StorageDead(_1); // scope 0 at $DIR/inline-compatibility.rs:13:21: 13:22
_0 = const (); // scope 0 at $DIR/inline-compatibility.rs:12:40: 14:2
return; // scope 0 at $DIR/inline-compatibility.rs:14:2: 14:2
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- // MIR for `not_inlined_c_variadic` before Inline
+ // MIR for `not_inlined_c_variadic` after Inline

fn not_inlined_c_variadic() -> () {
let mut _0: (); // return place in scope 0 at $DIR/inline-compatibility.rs:41:40: 41:40
let _1: u32; // in scope 0 at $DIR/inline-compatibility.rs:42:9: 42:10
scope 1 {
debug s => _1; // in scope 1 at $DIR/inline-compatibility.rs:42:9: 42:10
}

bb0: {
StorageLive(_1); // scope 0 at $DIR/inline-compatibility.rs:42:9: 42:10
_1 = sum(const 4_u32, const 4_u32, const 30_u32, const 200_u32, const 1000_u32) -> bb1; // scope 0 at $DIR/inline-compatibility.rs:42:13: 42:52
// mir::Constant
// + span: $DIR/inline-compatibility.rs:42:13: 42:16
// + literal: Const { ty: unsafe extern "C" fn(u32, ...) -> u32 {sum}, val: Value(Scalar(<ZST>)) }
}

bb1: {
_0 = const (); // scope 0 at $DIR/inline-compatibility.rs:41:40: 43:2
StorageDead(_1); // scope 0 at $DIR/inline-compatibility.rs:43:1: 43:2
return; // scope 0 at $DIR/inline-compatibility.rs:43:2: 43:2
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
+ // MIR for `not_inlined_no_sanitize` after Inline

fn not_inlined_no_sanitize() -> () {
let mut _0: (); // return place in scope 0 at $DIR/inline-compatibility.rs:29:41: 29:41
let _1: (); // in scope 0 at $DIR/inline-compatibility.rs:30:5: 30:18
let mut _0: (); // return place in scope 0 at $DIR/inline-compatibility.rs:28:41: 28:41
let _1: (); // in scope 0 at $DIR/inline-compatibility.rs:29:5: 29:18

bb0: {
StorageLive(_1); // scope 0 at $DIR/inline-compatibility.rs:30:5: 30:18
_1 = no_sanitize() -> bb1; // scope 0 at $DIR/inline-compatibility.rs:30:5: 30:18
StorageLive(_1); // scope 0 at $DIR/inline-compatibility.rs:29:5: 29:18
_1 = no_sanitize() -> bb1; // scope 0 at $DIR/inline-compatibility.rs:29:5: 29:18
// mir::Constant
// + span: $DIR/inline-compatibility.rs:30:5: 30:16
// + span: $DIR/inline-compatibility.rs:29:5: 29:16
// + literal: Const { ty: unsafe fn() {no_sanitize}, val: Value(Scalar(<ZST>)) }
}

bb1: {
StorageDead(_1); // scope 0 at $DIR/inline-compatibility.rs:30:18: 30:19
_0 = const (); // scope 0 at $DIR/inline-compatibility.rs:29:41: 31:2
return; // scope 0 at $DIR/inline-compatibility.rs:31:2: 31:2
StorageDead(_1); // scope 0 at $DIR/inline-compatibility.rs:29:18: 29:19
_0 = const (); // scope 0 at $DIR/inline-compatibility.rs:28:41: 30:2
return; // scope 0 at $DIR/inline-compatibility.rs:30:2: 30:2
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
+ // MIR for `not_inlined_target_feature` after Inline

fn not_inlined_target_feature() -> () {
let mut _0: (); // return place in scope 0 at $DIR/inline-compatibility.rs:18:44: 18:44
let _1: (); // in scope 0 at $DIR/inline-compatibility.rs:19:5: 19:21
let mut _0: (); // return place in scope 0 at $DIR/inline-compatibility.rs:17:44: 17:44
let _1: (); // in scope 0 at $DIR/inline-compatibility.rs:18:5: 18:21

bb0: {
StorageLive(_1); // scope 0 at $DIR/inline-compatibility.rs:19:5: 19:21
_1 = target_feature() -> bb1; // scope 0 at $DIR/inline-compatibility.rs:19:5: 19:21
StorageLive(_1); // scope 0 at $DIR/inline-compatibility.rs:18:5: 18:21
_1 = target_feature() -> bb1; // scope 0 at $DIR/inline-compatibility.rs:18:5: 18:21
// mir::Constant
// + span: $DIR/inline-compatibility.rs:19:5: 19:19
// + span: $DIR/inline-compatibility.rs:18:5: 18:19
// + literal: Const { ty: unsafe fn() {target_feature}, val: Value(Scalar(<ZST>)) }
}

bb1: {
StorageDead(_1); // scope 0 at $DIR/inline-compatibility.rs:19:21: 19:22
_0 = const (); // scope 0 at $DIR/inline-compatibility.rs:18:44: 20:2
return; // scope 0 at $DIR/inline-compatibility.rs:20:2: 20:2
StorageDead(_1); // scope 0 at $DIR/inline-compatibility.rs:18:21: 18:22
_0 = const (); // scope 0 at $DIR/inline-compatibility.rs:17:44: 19:2
return; // scope 0 at $DIR/inline-compatibility.rs:19:2: 19:2
}
}

123 changes: 123 additions & 0 deletions src/test/mir-opt/inline/inline_generator.main.Inline.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
- // MIR for `main` before Inline
+ // MIR for `main` after Inline

fn main() -> () {
let mut _0: (); // return place in scope 0 at $DIR/inline-generator.rs:8:11: 8:11
let _1: std::ops::GeneratorState<<impl std::ops::Generator<bool> as std::ops::Generator<bool>>::Yield, <impl std::ops::Generator<bool> as std::ops::Generator<bool>>::Return>; // in scope 0 at $DIR/inline-generator.rs:9:9: 9:11
let mut _2: std::pin::Pin<&mut impl std::ops::Generator<bool>>; // in scope 0 at $DIR/inline-generator.rs:9:14: 9:32
let mut _3: &mut impl std::ops::Generator<bool>; // in scope 0 at $DIR/inline-generator.rs:9:23: 9:31
let mut _4: impl std::ops::Generator<bool>; // in scope 0 at $DIR/inline-generator.rs:9:28: 9:31
+ let mut _7: bool; // in scope 0 at $DIR/inline-generator.rs:9:14: 9:46
scope 1 {
debug _r => _1; // in scope 1 at $DIR/inline-generator.rs:9:9: 9:11
}
+ scope 2 (inlined g) { // at $DIR/inline-generator.rs:9:28: 9:31
+ }
+ scope 3 (inlined Pin::<&mut [generator@$DIR/inline-generator.rs:15:5: 15:41 {bool, i32}]>::new) { // at $DIR/inline-generator.rs:9:14: 9:32
+ debug pointer => _3; // in scope 3 at $DIR/inline-generator.rs:9:14: 9:32
+ let mut _5: &mut [generator@$DIR/inline-generator.rs:15:5: 15:41 {bool, i32}]; // in scope 3 at $DIR/inline-generator.rs:9:14: 9:32
+ scope 4 {
+ scope 5 (inlined Pin::<&mut [generator@$DIR/inline-generator.rs:15:5: 15:41 {bool, i32}]>::new_unchecked) { // at $DIR/inline-generator.rs:9:14: 9:32
+ debug pointer => _5; // in scope 5 at $DIR/inline-generator.rs:9:14: 9:32
+ let mut _6: &mut [generator@$DIR/inline-generator.rs:15:5: 15:41 {bool, i32}]; // in scope 5 at $DIR/inline-generator.rs:9:14: 9:32
+ }
+ }
+ }
+ scope 6 (inlined g::{closure#0}) { // at $DIR/inline-generator.rs:9:14: 9:46
+ debug a => _8; // in scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ let mut _8: bool; // in scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ let mut _9: u32; // in scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ }

bb0: {
StorageLive(_1); // scope 0 at $DIR/inline-generator.rs:9:9: 9:11
StorageLive(_2); // scope 0 at $DIR/inline-generator.rs:9:14: 9:32
StorageLive(_3); // scope 0 at $DIR/inline-generator.rs:9:23: 9:31
StorageLive(_4); // scope 0 at $DIR/inline-generator.rs:9:28: 9:31
- _4 = g() -> bb1; // scope 0 at $DIR/inline-generator.rs:9:28: 9:31
- // mir::Constant
- // + span: $DIR/inline-generator.rs:9:28: 9:29
- // + literal: Const { ty: fn() -> impl std::ops::Generator<bool> {g}, val: Value(Scalar(<ZST>)) }
- }
-
- bb1: {
+ discriminant(_4) = 0; // scope 2 at $DIR/inline-generator.rs:9:28: 9:31
_3 = &mut _4; // scope 0 at $DIR/inline-generator.rs:9:23: 9:31
- _2 = Pin::<&mut impl Generator<bool>>::new(move _3) -> [return: bb2, unwind: bb4]; // scope 0 at $DIR/inline-generator.rs:9:14: 9:32
- // mir::Constant
- // + span: $DIR/inline-generator.rs:9:14: 9:22
- // + user_ty: UserType(0)
- // + literal: Const { ty: fn(&mut impl std::ops::Generator<bool>) -> std::pin::Pin<&mut impl std::ops::Generator<bool>> {std::pin::Pin::<&mut impl std::ops::Generator<bool>>::new}, val: Value(Scalar(<ZST>)) }
- }
-
- bb2: {
+ StorageLive(_5); // scope 4 at $DIR/inline-generator.rs:9:14: 9:32
+ _5 = move _3; // scope 4 at $DIR/inline-generator.rs:9:14: 9:32
+ StorageLive(_6); // scope 5 at $DIR/inline-generator.rs:9:14: 9:32
+ _6 = move _5; // scope 5 at $DIR/inline-generator.rs:9:14: 9:32
+ (_2.0: &mut [generator@$DIR/inline-generator.rs:15:5: 15:41 {bool, i32}]) = move _6; // scope 5 at $DIR/inline-generator.rs:9:14: 9:32
+ StorageDead(_6); // scope 5 at $DIR/inline-generator.rs:9:14: 9:32
+ StorageDead(_5); // scope 4 at $DIR/inline-generator.rs:9:14: 9:32
StorageDead(_3); // scope 0 at $DIR/inline-generator.rs:9:31: 9:32
- _1 = <impl Generator<bool> as Generator<bool>>::resume(move _2, const false) -> [return: bb3, unwind: bb4]; // scope 0 at $DIR/inline-generator.rs:9:14: 9:46
- // mir::Constant
- // + span: $DIR/inline-generator.rs:9:33: 9:39
- // + literal: Const { ty: for<'r> fn(std::pin::Pin<&'r mut impl std::ops::Generator<bool>>, bool) -> std::ops::GeneratorState<<impl std::ops::Generator<bool> as std::ops::Generator<bool>>::Yield, <impl std::ops::Generator<bool> as std::ops::Generator<bool>>::Return> {<impl std::ops::Generator<bool> as std::ops::Generator<bool>>::resume}, val: Value(Scalar(<ZST>)) }
+ StorageLive(_7); // scope 0 at $DIR/inline-generator.rs:9:14: 9:46
+ _7 = const false; // scope 0 at $DIR/inline-generator.rs:9:14: 9:46
+ _9 = discriminant((*(_2.0: &mut [generator@$DIR/inline-generator.rs:15:5: 15:41 {bool, i32}]))); // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ switchInt(move _9) -> [0_u32: bb3, 1_u32: bb8, 3_u32: bb7, otherwise: bb9]; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
}

- bb3: {
+ bb1: {
+ StorageDead(_7); // scope 0 at $DIR/inline-generator.rs:9:14: 9:46
StorageDead(_2); // scope 0 at $DIR/inline-generator.rs:9:45: 9:46
StorageDead(_4); // scope 0 at $DIR/inline-generator.rs:9:46: 9:47
_0 = const (); // scope 0 at $DIR/inline-generator.rs:8:11: 10:2
StorageDead(_1); // scope 0 at $DIR/inline-generator.rs:10:1: 10:2
return; // scope 0 at $DIR/inline-generator.rs:10:2: 10:2
}

- bb4 (cleanup): {
+ bb2 (cleanup): {
resume; // scope 0 at $DIR/inline-generator.rs:8:1: 10:2
+ }
+
+ bb3: {
+ _8 = move _7; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ switchInt(_8) -> [false: bb4, otherwise: bb5]; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ }
+
+ bb4: {
+ ((_1 as Yielded).0: i32) = const 13_i32; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ goto -> bb6; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ }
+
+ bb5: {
+ ((_1 as Yielded).0: i32) = const 7_i32; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ goto -> bb6; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ }
+
+ bb6: {
+ discriminant(_1) = 0; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ discriminant((*(_2.0: &mut [generator@$DIR/inline-generator.rs:15:5: 15:41 {bool, i32}]))) = 3; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ goto -> bb1; // scope 0 at $DIR/inline-generator.rs:15:11: 15:39
+ }
+
+ bb7: {
+ ((_1 as Complete).0: bool) = move _7; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ discriminant(_1) = 1; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ discriminant((*(_2.0: &mut [generator@$DIR/inline-generator.rs:15:5: 15:41 {bool, i32}]))) = 1; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ goto -> bb1; // scope 0 at $DIR/inline-generator.rs:15:41: 15:41
+ }
+
+ bb8: {
+ assert(const false, "generator resumed after completion") -> [success: bb8, unwind: bb2]; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
+ }
+
+ bb9: {
+ unreachable; // scope 6 at $DIR/inline-generator.rs:9:14: 9:46
}
}

0 comments on commit 2a010dd

Please sign in to comment.