Skip to content

Commit

Permalink
Auto merge of #85023 - RalfJung:array-to-raw-elem, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history 
array-to-raw-elem cast: test that Retag covers entire array

Make sure that we `Retag` *before* doing the `ArrayToPointer` cast.
  • Loading branch information
@bors
bors committed May 11, 2021
2 parents 506e75c + 2d2ed21 commit 2bafe96
Show file tree
Hide file tree
Showing 3 changed files with 241 additions and 18 deletions.
199 changes: 199 additions & 0 deletions src/test/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.mir
View file
@@ -0,0 +1,199 @@
// MIR for `array_casts` after SimplifyCfg-elaborate-drops

fn array_casts() -> () {
let mut _0: (); // return place in scope 0 at $DIR/retag.rs:57:18: 57:18
let mut _1: [usize; 2]; // in scope 0 at $DIR/retag.rs:58:9: 58:14
let mut _3: *mut [usize; 2]; // in scope 0 at $DIR/retag.rs:59:13: 59:19
let mut _4: &mut [usize; 2]; // in scope 0 at $DIR/retag.rs:59:13: 59:19
let _5: (); // in scope 0 at $DIR/retag.rs:60:5: 60:30
let mut _6: *mut usize; // in scope 0 at $DIR/retag.rs:60:15: 60:23
let mut _7: *mut usize; // in scope 0 at $DIR/retag.rs:60:15: 60:16
let mut _10: *const [usize; 2]; // in scope 0 at $DIR/retag.rs:63:13: 63:15
let _11: &[usize; 2]; // in scope 0 at $DIR/retag.rs:63:13: 63:15
let _12: (); // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let mut _13: (&usize, &usize); // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let mut _14: &usize; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let _15: usize; // in scope 0 at $DIR/retag.rs:64:16: 64:36
let mut _16: *const usize; // in scope 0 at $DIR/retag.rs:64:26: 64:34
let mut _17: *const usize; // in scope 0 at $DIR/retag.rs:64:26: 64:27
let mut _18: &usize; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let _19: usize; // in scope 0 at $DIR/retag.rs:64:38: 64:39
let mut _22: bool; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let mut _23: bool; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let mut _24: usize; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let mut _25: usize; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let mut _26: !; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let _28: !; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let mut _29: core::panicking::AssertKind; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let mut _30: &usize; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let _31: &usize; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let mut _32: &usize; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let _33: &usize; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let mut _34: std::option::Option<std::fmt::Arguments>; // in scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
scope 1 {
debug x => _1; // in scope 1 at $DIR/retag.rs:58:9: 58:14
let _2: *mut usize; // in scope 1 at $DIR/retag.rs:59:9: 59:10
scope 2 {
debug p => _2; // in scope 2 at $DIR/retag.rs:59:9: 59:10
let _8: [usize; 2]; // in scope 2 at $DIR/retag.rs:62:9: 62:10
scope 3 {
}
scope 4 {
debug x => _8; // in scope 4 at $DIR/retag.rs:62:9: 62:10
let _9: *const usize; // in scope 4 at $DIR/retag.rs:63:9: 63:10
scope 5 {
debug p => _9; // in scope 5 at $DIR/retag.rs:63:9: 63:10
let _20: &usize; // in scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let _21: &usize; // in scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let mut _35: &usize; // in scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
scope 6 {
}
scope 7 {
debug left_val => _20; // in scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
debug right_val => _21; // in scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
let _27: core::panicking::AssertKind; // in scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
scope 8 {
debug kind => _27; // in scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
}
}
}
}
}
}

bb0: {
StorageLive(_1); // scope 0 at $DIR/retag.rs:58:9: 58:14
_1 = [const 0_usize, const 0_usize]; // scope 0 at $DIR/retag.rs:58:29: 58:35
StorageLive(_2); // scope 1 at $DIR/retag.rs:59:9: 59:10
StorageLive(_3); // scope 1 at $DIR/retag.rs:59:13: 59:19
StorageLive(_4); // scope 1 at $DIR/retag.rs:59:13: 59:19
_4 = &mut _1; // scope 1 at $DIR/retag.rs:59:13: 59:19
Retag(_4); // scope 1 at $DIR/retag.rs:59:13: 59:19
_3 = &raw mut (*_4); // scope 1 at $DIR/retag.rs:59:13: 59:19
Retag([raw] _3); // scope 1 at $DIR/retag.rs:59:13: 59:19
_2 = move _3 as *mut usize (Pointer(ArrayToPointer)); // scope 1 at $DIR/retag.rs:59:13: 59:33
StorageDead(_3); // scope 1 at $DIR/retag.rs:59:32: 59:33
StorageDead(_4); // scope 1 at $DIR/retag.rs:59:33: 59:34
StorageLive(_5); // scope 2 at $DIR/retag.rs:60:5: 60:30
StorageLive(_6); // scope 3 at $DIR/retag.rs:60:15: 60:23
StorageLive(_7); // scope 3 at $DIR/retag.rs:60:15: 60:16
_7 = _2; // scope 3 at $DIR/retag.rs:60:15: 60:16
_6 = ptr::mut_ptr::<impl *mut usize>::add(move _7, const 1_usize) -> bb1; // scope 3 at $DIR/retag.rs:60:15: 60:23
// mir::Constant
// + span: $DIR/retag.rs:60:17: 60:20
// + literal: Const { ty: unsafe fn(*mut usize, usize) -> *mut usize {std::ptr::mut_ptr::<impl *mut usize>::add}, val: Value(Scalar(<ZST>)) }
}

bb1: {
StorageDead(_7); // scope 3 at $DIR/retag.rs:60:22: 60:23
(*_6) = const 1_usize; // scope 3 at $DIR/retag.rs:60:14: 60:27
StorageDead(_6); // scope 3 at $DIR/retag.rs:60:27: 60:28
_5 = const (); // scope 3 at $DIR/retag.rs:60:5: 60:30
StorageDead(_5); // scope 2 at $DIR/retag.rs:60:29: 60:30
StorageLive(_8); // scope 2 at $DIR/retag.rs:62:9: 62:10
_8 = [const 0_usize, const 1_usize]; // scope 2 at $DIR/retag.rs:62:25: 62:31
StorageLive(_9); // scope 4 at $DIR/retag.rs:63:9: 63:10
StorageLive(_10); // scope 4 at $DIR/retag.rs:63:13: 63:15
StorageLive(_11); // scope 4 at $DIR/retag.rs:63:13: 63:15
_11 = &_8; // scope 4 at $DIR/retag.rs:63:13: 63:15
Retag(_11); // scope 4 at $DIR/retag.rs:63:13: 63:15
_10 = &raw const (*_11); // scope 4 at $DIR/retag.rs:63:13: 63:15
Retag([raw] _10); // scope 4 at $DIR/retag.rs:63:13: 63:15
_9 = move _10 as *const usize (Pointer(ArrayToPointer)); // scope 4 at $DIR/retag.rs:63:13: 63:31
StorageDead(_10); // scope 4 at $DIR/retag.rs:63:30: 63:31
StorageDead(_11); // scope 4 at $DIR/retag.rs:63:31: 63:32
StorageLive(_12); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_13); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_14); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_15); // scope 5 at $DIR/retag.rs:64:16: 64:36
StorageLive(_16); // scope 6 at $DIR/retag.rs:64:26: 64:34
StorageLive(_17); // scope 6 at $DIR/retag.rs:64:26: 64:27
_17 = _9; // scope 6 at $DIR/retag.rs:64:26: 64:27
_16 = ptr::const_ptr::<impl *const usize>::add(move _17, const 1_usize) -> bb2; // scope 6 at $DIR/retag.rs:64:26: 64:34
// mir::Constant
// + span: $DIR/retag.rs:64:28: 64:31
// + literal: Const { ty: unsafe fn(*const usize, usize) -> *const usize {std::ptr::const_ptr::<impl *const usize>::add}, val: Value(Scalar(<ZST>)) }
}

bb2: {
StorageDead(_17); // scope 6 at $DIR/retag.rs:64:33: 64:34
_15 = (*_16); // scope 6 at $DIR/retag.rs:64:25: 64:34
_14 = &_15; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
Retag(_14); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_18); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_35 = const array_casts::promoted[0]; // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
// ty::Const
// + ty: &usize
// + val: Unevaluated(array_casts, [], Some(promoted[0]))
// mir::Constant
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
// + literal: Const { ty: &usize, val: Unevaluated(Unevaluated { def: WithOptConstParam { did: DefId(0:15 ~ retag[317d]::array_casts), const_param_did: None }, substs: [], promoted: Some(promoted[0]) }) }
Retag(_35); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_18 = &(*_35); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
Retag(_18); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_13 = (move _14, move _18); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_18); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_14); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_20); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_20 = (_13.0: &usize); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
Retag(_20); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_21); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_21 = (_13.1: &usize); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
Retag(_21); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_22); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_23); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_24); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_24 = (*_20); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_25); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_25 = (*_21); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_23 = Eq(move _24, move _25); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_25); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_24); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_22 = Not(move _23); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_23); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
switchInt(move _22) -> [false: bb4, otherwise: bb3]; // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
}

bb3: {
StorageLive(_27); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_27 = core::panicking::AssertKind::Eq; // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_28); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_29); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_29 = move _27; // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_30); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_31); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_31 = &(*_20); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
Retag(_31); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_30 = &(*_31); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
Retag(_30); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_32); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_33); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_33 = &(*_21); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
Retag(_33); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_32 = &(*_33); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
Retag(_32); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageLive(_34); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_34 = Option::<Arguments>::None; // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
core::panicking::assert_failed::<usize, usize>(move _29, move _30, move _32, move _34); // scope 8 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
// mir::Constant
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
// + literal: Const { ty: for<'r, 's, 't0> fn(core::panicking::AssertKind, &'r usize, &'s usize, std::option::Option<std::fmt::Arguments<'t0>>) -> ! {core::panicking::assert_failed::<usize, usize>}, val: Value(Scalar(<ZST>)) }
}

bb4: {
_12 = const (); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_22); // scope 7 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_21); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_20); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_16); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_15); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_13); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
StorageDead(_12); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
_0 = const (); // scope 0 at $DIR/retag.rs:57:18: 65:2
StorageDead(_9); // scope 4 at $DIR/retag.rs:65:1: 65:2
StorageDead(_8); // scope 2 at $DIR/retag.rs:65:1: 65:2
StorageDead(_2); // scope 1 at $DIR/retag.rs:65:1: 65:2
StorageDead(_1); // scope 0 at $DIR/retag.rs:65:1: 65:2
return; // scope 0 at $DIR/retag.rs:65:2: 65:2
}
}

0 comments on commit 2bafe96

Please sign in to comment.