From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:26:03 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- ...nvalid_constant.main.GVN.32bit.panic-abort.diff | 4 +- ...valid_constant.main.GVN.32bit.panic-unwind.diff | 4 +- ...nvalid_constant.main.GVN.64bit.panic-abort.diff | 4 +- ...valid_constant.main.GVN.64bit.panic-unwind.diff | 4 +- .../loops.int_range.PreCodegen.after.mir | 2 +- .../mem_replace.mem_replace.PreCodegen.after.mir | 10 +-- ...r.forward_loop.PreCodegen.after.panic-abort.mir | 2 +- ....forward_loop.PreCodegen.after.panic-unwind.mir | 2 +- ...ange_iter_next.PreCodegen.after.panic-abort.mir | 2 +- ...nge_iter_next.PreCodegen.after.panic-unwind.mir | 2 +- ...lter.variant_a-{closure#0}.PreCodegen.after.mir | 16 ++-- ..._get_mut_usize.PreCodegen.after.panic-abort.mir | 43 ++++++----- ...get_mut_usize.PreCodegen.after.panic-unwind.mir | 43 ++++++----- ...cked_mut_range.PreCodegen.after.panic-abort.mir | 85 +++++++++++----------- ...ked_mut_range.PreCodegen.after.panic-unwind.mir | 85 +++++++++++----------- ...numerated_loop.PreCodegen.after.panic-abort.mir | 10 +-- ...umerated_loop.PreCodegen.after.panic-unwind.mir | 10 +-- ...r.forward_loop.PreCodegen.after.panic-abort.mir | 10 +-- ....forward_loop.PreCodegen.after.panic-unwind.mir | 10 +-- ...ter.range_loop.PreCodegen.after.panic-abort.mir | 2 +- ...er.range_loop.PreCodegen.after.panic-unwind.mir | 2 +- ...r.reverse_loop.PreCodegen.after.panic-abort.mir | 10 +-- ....reverse_loop.PreCodegen.after.panic-unwind.mir | 10 +-- 23 files changed, 182 insertions(+), 190 deletions(-) (limited to 'tests/mir-opt/pre-codegen') diff --git a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff index 50189d192..d5628dc7a 100644 --- a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff +++ b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff @@ -69,7 +69,7 @@ bb3: { - _1 = move ((_2 as Some).0: std::alloc::Layout); -+ _1 = const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(4 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x00000000): ptr::alignment::AlignmentEnum32) }}; ++ _1 = const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(4 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x00000000): std::ptr::alignment::AlignmentEnum32) }}; StorageDead(_10); StorageDead(_2); StorageLive(_3); @@ -78,7 +78,7 @@ StorageLive(_6); _9 = const _; - _6 = std::alloc::Global::alloc_impl(_9, _1, const false) -> [return: bb4, unwind unreachable]; -+ _6 = std::alloc::Global::alloc_impl(const {ALLOC1: &std::alloc::Global}, const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(4 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x00000000): ptr::alignment::AlignmentEnum32) }}, const false) -> [return: bb4, unwind unreachable]; ++ _6 = std::alloc::Global::alloc_impl(const {ALLOC1: &std::alloc::Global}, const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(4 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x00000000): std::ptr::alignment::AlignmentEnum32) }}, const false) -> [return: bb4, unwind unreachable]; } bb4: { diff --git a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-unwind.diff b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-unwind.diff index 6966762a1..d28059458 100644 --- a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-unwind.diff +++ b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-unwind.diff @@ -67,7 +67,7 @@ bb4: { - _1 = move ((_2 as Some).0: std::alloc::Layout); -+ _1 = const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(4 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x00000000): ptr::alignment::AlignmentEnum32) }}; ++ _1 = const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(4 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x00000000): std::ptr::alignment::AlignmentEnum32) }}; StorageDead(_10); StorageDead(_2); StorageLive(_3); @@ -76,7 +76,7 @@ StorageLive(_6); _9 = const _; - _6 = std::alloc::Global::alloc_impl(_9, _1, const false) -> [return: bb5, unwind continue]; -+ _6 = std::alloc::Global::alloc_impl(const {ALLOC1: &std::alloc::Global}, const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(4 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x00000000): ptr::alignment::AlignmentEnum32) }}, const false) -> [return: bb5, unwind continue]; ++ _6 = std::alloc::Global::alloc_impl(const {ALLOC1: &std::alloc::Global}, const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(4 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x00000000): std::ptr::alignment::AlignmentEnum32) }}, const false) -> [return: bb5, unwind continue]; } bb5: { diff --git a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-abort.diff b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-abort.diff index 08a185bad..d139fc73e 100644 --- a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-abort.diff +++ b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-abort.diff @@ -69,7 +69,7 @@ bb3: { - _1 = move ((_2 as Some).0: std::alloc::Layout); -+ _1 = const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(8 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x0000000000000000): ptr::alignment::AlignmentEnum64) }}; ++ _1 = const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(8 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x0000000000000000): std::ptr::alignment::AlignmentEnum64) }}; StorageDead(_10); StorageDead(_2); StorageLive(_3); @@ -78,7 +78,7 @@ StorageLive(_6); _9 = const _; - _6 = std::alloc::Global::alloc_impl(_9, _1, const false) -> [return: bb4, unwind unreachable]; -+ _6 = std::alloc::Global::alloc_impl(const {ALLOC1: &std::alloc::Global}, const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(8 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x0000000000000000): ptr::alignment::AlignmentEnum64) }}, const false) -> [return: bb4, unwind unreachable]; ++ _6 = std::alloc::Global::alloc_impl(const {ALLOC1: &std::alloc::Global}, const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(8 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x0000000000000000): std::ptr::alignment::AlignmentEnum64) }}, const false) -> [return: bb4, unwind unreachable]; } bb4: { diff --git a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-unwind.diff b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-unwind.diff index 6501cb85e..63db9553b 100644 --- a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-unwind.diff +++ b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-unwind.diff @@ -67,7 +67,7 @@ bb4: { - _1 = move ((_2 as Some).0: std::alloc::Layout); -+ _1 = const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(8 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x0000000000000000): ptr::alignment::AlignmentEnum64) }}; ++ _1 = const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(8 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x0000000000000000): std::ptr::alignment::AlignmentEnum64) }}; StorageDead(_10); StorageDead(_2); StorageLive(_3); @@ -76,7 +76,7 @@ StorageLive(_6); _9 = const _; - _6 = std::alloc::Global::alloc_impl(_9, _1, const false) -> [return: bb5, unwind continue]; -+ _6 = std::alloc::Global::alloc_impl(const {ALLOC1: &std::alloc::Global}, const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(8 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x0000000000000000): ptr::alignment::AlignmentEnum64) }}, const false) -> [return: bb5, unwind continue]; ++ _6 = std::alloc::Global::alloc_impl(const {ALLOC1: &std::alloc::Global}, const Layout {{ size: Indirect { alloc_id: ALLOC0, offset: Size(8 bytes) }: usize, align: std::ptr::Alignment(Scalar(0x0000000000000000): std::ptr::alignment::AlignmentEnum64) }}, const false) -> [return: bb5, unwind continue]; } bb5: { diff --git a/tests/mir-opt/pre-codegen/loops.int_range.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/loops.int_range.PreCodegen.after.mir index 49f685cfa..73a3be7f3 100644 --- a/tests/mir-opt/pre-codegen/loops.int_range.PreCodegen.after.mir +++ b/tests/mir-opt/pre-codegen/loops.int_range.PreCodegen.after.mir @@ -30,7 +30,7 @@ fn int_range(_1: usize, _2: usize) -> () { scope 7 { } } - scope 8 (inlined cmp::impls::::lt) { + scope 8 (inlined std::cmp::impls::::lt) { debug self => _6; debug other => _7; let mut _8: usize; diff --git a/tests/mir-opt/pre-codegen/mem_replace.mem_replace.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/mem_replace.mem_replace.PreCodegen.after.mir index 630babaa8..713d6cc55 100644 --- a/tests/mir-opt/pre-codegen/mem_replace.mem_replace.PreCodegen.after.mir +++ b/tests/mir-opt/pre-codegen/mem_replace.mem_replace.PreCodegen.after.mir @@ -24,16 +24,16 @@ fn mem_replace(_1: &mut u32, _2: u32) -> u32 { debug src => _1; scope 7 (inlined intrinsics::is_aligned_and_not_null::) { debug ptr => _1; - scope 8 (inlined ptr::const_ptr::::is_null) { + scope 8 (inlined std::ptr::const_ptr::::is_null) { debug self => _1; let mut _3: *const u8; scope 9 { - scope 10 (inlined ptr::const_ptr::::is_null::runtime_impl) { + scope 10 (inlined std::ptr::const_ptr::::is_null::runtime_impl) { debug ptr => _3; - scope 11 (inlined ptr::const_ptr::::addr) { + scope 11 (inlined std::ptr::const_ptr::::addr) { debug self => _3; scope 12 { - scope 13 (inlined ptr::const_ptr::::cast::<()>) { + scope 13 (inlined std::ptr::const_ptr::::cast::<()>) { debug self => _3; } } @@ -41,7 +41,7 @@ fn mem_replace(_1: &mut u32, _2: u32) -> u32 { } } } - scope 14 (inlined ptr::const_ptr::::is_aligned) { + scope 14 (inlined std::ptr::const_ptr::::is_aligned) { debug self => _1; scope 15 (inlined align_of::) { } diff --git a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-abort.mir index 91c3731f4..cd734b10f 100644 --- a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-abort.mir +++ b/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-abort.mir @@ -33,7 +33,7 @@ fn forward_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () { scope 7 { } } - scope 8 (inlined cmp::impls::::lt) { + scope 8 (inlined std::cmp::impls::::lt) { debug self => _7; debug other => _8; let mut _9: u32; diff --git a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir index f76de02c9..3342da545 100644 --- a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir +++ b/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir @@ -33,7 +33,7 @@ fn forward_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () { scope 7 { } } - scope 8 (inlined cmp::impls::::lt) { + scope 8 (inlined std::cmp::impls::::lt) { debug self => _7; debug other => _8; let mut _9: u32; diff --git a/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-abort.mir index a7824f36d..6ed3d73b1 100644 --- a/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-abort.mir +++ b/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-abort.mir @@ -17,7 +17,7 @@ fn range_iter_next(_1: &mut std::ops::Range) -> Option { scope 4 { } } - scope 5 (inlined cmp::impls::::lt) { + scope 5 (inlined std::cmp::impls::::lt) { debug self => _2; debug other => _3; let mut _4: u32; diff --git a/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-unwind.mir index 83c9e6c1a..a030647de 100644 --- a/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-unwind.mir +++ b/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-unwind.mir @@ -17,7 +17,7 @@ fn range_iter_next(_1: &mut std::ops::Range) -> Option { scope 4 { } } - scope 5 (inlined cmp::impls::::lt) { + scope 5 (inlined std::cmp::impls::::lt) { debug self => _2; debug other => _3; let mut _4: u32; diff --git a/tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.PreCodegen.after.mir index 548767dca..05f16cdac 100644 --- a/tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.PreCodegen.after.mir +++ b/tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.PreCodegen.after.mir @@ -30,48 +30,48 @@ fn variant_a::{closure#0}(_1: &mut {closure@$DIR/slice_filter.rs:8:25: 8:39}, _2 debug b => _6; debug c => _8; debug d => _10; - scope 2 (inlined cmp::impls::::le) { + scope 2 (inlined std::cmp::impls::::le) { debug self => _11; debug other => _13; let mut _14: &usize; let mut _15: &usize; - scope 3 (inlined cmp::impls::::le) { + scope 3 (inlined std::cmp::impls::::le) { debug self => _14; debug other => _15; let mut _16: usize; let mut _17: usize; } } - scope 4 (inlined cmp::impls::::le) { + scope 4 (inlined std::cmp::impls::::le) { debug self => _19; debug other => _21; let mut _22: &usize; let mut _23: &usize; - scope 5 (inlined cmp::impls::::le) { + scope 5 (inlined std::cmp::impls::::le) { debug self => _22; debug other => _23; let mut _24: usize; let mut _25: usize; } } - scope 6 (inlined cmp::impls::::le) { + scope 6 (inlined std::cmp::impls::::le) { debug self => _27; debug other => _29; let mut _30: &usize; let mut _31: &usize; - scope 7 (inlined cmp::impls::::le) { + scope 7 (inlined std::cmp::impls::::le) { debug self => _30; debug other => _31; let mut _32: usize; let mut _33: usize; } } - scope 8 (inlined cmp::impls::::le) { + scope 8 (inlined std::cmp::impls::::le) { debug self => _35; debug other => _37; let mut _38: &usize; let mut _39: &usize; - scope 9 (inlined cmp::impls::::le) { + scope 9 (inlined std::cmp::impls::::le) { debug self => _38; debug other => _39; let mut _40: usize; diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-abort.mir index 8590c9d3b..e4d9060d4 100644 --- a/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-abort.mir +++ b/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-abort.mir @@ -20,33 +20,30 @@ fn slice_get_mut_usize(_1: &mut [u32], _2: usize) -> Option<&mut u32> { debug self => _2; debug slice => _5; let mut _6: *mut u32; + let mut _9: &[&str]; scope 5 { - debug this => _2; - scope 6 { - scope 7 (inlined >::get_unchecked_mut::runtime::) { - debug this => _2; - debug slice => _5; - scope 8 (inlined ptr::mut_ptr::::len) { - debug self => _5; - let mut _9: *const [u32]; - scope 9 (inlined std::ptr::metadata::<[u32]>) { - debug ptr => _9; - scope 10 { - } - } - } - } - scope 11 (inlined ptr::mut_ptr::::as_mut_ptr) { - debug self => _5; + scope 10 (inlined std::ptr::mut_ptr::::as_mut_ptr) { + debug self => _5; + } + scope 11 (inlined std::ptr::mut_ptr::::add) { + debug self => _6; + debug count => _2; + scope 12 { } - scope 12 (inlined ptr::mut_ptr::::add) { - debug self => _6; - debug count => _2; - scope 13 { - } + } + } + scope 6 (inlined std::ptr::mut_ptr::::len) { + debug self => _5; + let mut _10: *const [u32]; + scope 7 (inlined std::ptr::metadata::<[u32]>) { + debug ptr => _10; + scope 8 { } } } + scope 9 (inlined Arguments::<'_>::new_const) { + debug pieces => _9; + } } } } @@ -73,10 +70,12 @@ fn slice_get_mut_usize(_1: &mut [u32], _2: usize) -> Option<&mut u32> { StorageLive(_5); _5 = &raw mut (*_1); StorageLive(_9); + StorageLive(_10); StorageLive(_6); _6 = _5 as *mut u32 (PtrToPtr); _7 = Offset(_6, _2); StorageDead(_6); + StorageDead(_10); StorageDead(_9); StorageDead(_5); _8 = &mut (*_7); diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-unwind.mir index 8590c9d3b..e4d9060d4 100644 --- a/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-unwind.mir +++ b/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-unwind.mir @@ -20,33 +20,30 @@ fn slice_get_mut_usize(_1: &mut [u32], _2: usize) -> Option<&mut u32> { debug self => _2; debug slice => _5; let mut _6: *mut u32; + let mut _9: &[&str]; scope 5 { - debug this => _2; - scope 6 { - scope 7 (inlined >::get_unchecked_mut::runtime::) { - debug this => _2; - debug slice => _5; - scope 8 (inlined ptr::mut_ptr::::len) { - debug self => _5; - let mut _9: *const [u32]; - scope 9 (inlined std::ptr::metadata::<[u32]>) { - debug ptr => _9; - scope 10 { - } - } - } - } - scope 11 (inlined ptr::mut_ptr::::as_mut_ptr) { - debug self => _5; + scope 10 (inlined std::ptr::mut_ptr::::as_mut_ptr) { + debug self => _5; + } + scope 11 (inlined std::ptr::mut_ptr::::add) { + debug self => _6; + debug count => _2; + scope 12 { } - scope 12 (inlined ptr::mut_ptr::::add) { - debug self => _6; - debug count => _2; - scope 13 { - } + } + } + scope 6 (inlined std::ptr::mut_ptr::::len) { + debug self => _5; + let mut _10: *const [u32]; + scope 7 (inlined std::ptr::metadata::<[u32]>) { + debug ptr => _10; + scope 8 { } } } + scope 9 (inlined Arguments::<'_>::new_const) { + debug pieces => _9; + } } } } @@ -73,10 +70,12 @@ fn slice_get_mut_usize(_1: &mut [u32], _2: usize) -> Option<&mut u32> { StorageLive(_5); _5 = &raw mut (*_1); StorageLive(_9); + StorageLive(_10); StorageLive(_6); _6 = _5 as *mut u32 (PtrToPtr); _7 = Offset(_6, _2); StorageDead(_6); + StorageDead(_10); StorageDead(_9); StorageDead(_5); _8 = &mut (*_7); diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-abort.mir index 729841ec5..0d95f81c3 100644 --- a/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-abort.mir +++ b/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-abort.mir @@ -19,56 +19,51 @@ fn slice_get_unchecked_mut_range(_1: &mut [u32], _2: std::ops::Range) -> debug slice => _5; let mut _7: *mut u32; let mut _8: *mut u32; + let mut _14: &[&str]; scope 4 { - debug ((this: std::ops::Range).0: usize) => _3; - debug ((this: std::ops::Range).1: usize) => _4; + let _6: usize; scope 5 { - let _6: usize; - scope 6 { - debug new_len => _6; - scope 11 (inlined ptr::mut_ptr::::as_mut_ptr) { - debug self => _5; + debug new_len => _6; + scope 10 (inlined std::ptr::mut_ptr::::as_mut_ptr) { + debug self => _5; + } + scope 11 (inlined std::ptr::mut_ptr::::add) { + debug self => _7; + debug count => _3; + scope 12 { } - scope 12 (inlined ptr::mut_ptr::::add) { - debug self => _7; - debug count => _3; - scope 13 { - } + } + scope 13 (inlined slice_from_raw_parts_mut::) { + debug data => _8; + debug len => _6; + let mut _9: *mut (); + scope 14 (inlined std::ptr::mut_ptr::::cast::<()>) { + debug self => _8; } - scope 14 (inlined slice_from_raw_parts_mut::) { - debug data => _8; - debug len => _6; - let mut _9: *mut (); - scope 15 (inlined ptr::mut_ptr::::cast::<()>) { - debug self => _8; - } - scope 16 (inlined std::ptr::from_raw_parts_mut::<[u32]>) { - debug data_address => _9; - debug metadata => _6; - let mut _10: *const (); - let mut _11: std::ptr::metadata::PtrComponents<[u32]>; - let mut _12: std::ptr::metadata::PtrRepr<[u32]>; - scope 17 { - } + scope 15 (inlined std::ptr::from_raw_parts_mut::<[u32]>) { + debug data_address => _9; + debug metadata => _6; + let mut _10: *const (); + let mut _11: std::ptr::metadata::PtrComponents<[u32]>; + let mut _12: std::ptr::metadata::PtrRepr<[u32]>; + scope 16 { } } } - scope 7 (inlined as SliceIndex<[T]>>::get_unchecked_mut::runtime::) { - debug ((this: std::ops::Range).0: usize) => _3; - debug ((this: std::ops::Range).1: usize) => _4; - debug slice => _5; - scope 8 (inlined ptr::mut_ptr::::len) { - debug self => _5; - let mut _14: *const [u32]; - scope 9 (inlined std::ptr::metadata::<[u32]>) { - debug ptr => _14; - scope 10 { - } - } - } + } + } + scope 6 (inlined std::ptr::mut_ptr::::len) { + debug self => _5; + let mut _15: *const [u32]; + scope 7 (inlined std::ptr::metadata::<[u32]>) { + debug ptr => _15; + scope 8 { } } } + scope 9 (inlined Arguments::<'_>::new_const) { + debug pieces => _14; + } } } } @@ -78,8 +73,9 @@ fn slice_get_unchecked_mut_range(_1: &mut [u32], _2: std::ops::Range) -> _4 = move (_2.1: usize); StorageLive(_5); _5 = &raw mut (*_1); - StorageLive(_6); StorageLive(_14); + StorageLive(_6); + StorageLive(_15); _6 = SubUnchecked(_4, _3); StorageLive(_8); StorageLive(_7); @@ -92,16 +88,17 @@ fn slice_get_unchecked_mut_range(_1: &mut [u32], _2: std::ops::Range) -> StorageLive(_11); StorageLive(_10); _10 = _9 as *const () (PointerCoercion(MutToConstPointer)); - _11 = ptr::metadata::PtrComponents::<[u32]> { data_address: move _10, metadata: _6 }; + _11 = std::ptr::metadata::PtrComponents::<[u32]> { data_address: move _10, metadata: _6 }; StorageDead(_10); - _12 = ptr::metadata::PtrRepr::<[u32]> { const_ptr: move _11 }; + _12 = std::ptr::metadata::PtrRepr::<[u32]> { const_ptr: move _11 }; StorageDead(_11); _13 = (_12.1: *mut [u32]); StorageDead(_12); StorageDead(_9); StorageDead(_8); - StorageDead(_14); + StorageDead(_15); StorageDead(_6); + StorageDead(_14); StorageDead(_5); _0 = &mut (*_13); return; diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir index 729841ec5..0d95f81c3 100644 --- a/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir +++ b/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir @@ -19,56 +19,51 @@ fn slice_get_unchecked_mut_range(_1: &mut [u32], _2: std::ops::Range) -> debug slice => _5; let mut _7: *mut u32; let mut _8: *mut u32; + let mut _14: &[&str]; scope 4 { - debug ((this: std::ops::Range).0: usize) => _3; - debug ((this: std::ops::Range).1: usize) => _4; + let _6: usize; scope 5 { - let _6: usize; - scope 6 { - debug new_len => _6; - scope 11 (inlined ptr::mut_ptr::::as_mut_ptr) { - debug self => _5; + debug new_len => _6; + scope 10 (inlined std::ptr::mut_ptr::::as_mut_ptr) { + debug self => _5; + } + scope 11 (inlined std::ptr::mut_ptr::::add) { + debug self => _7; + debug count => _3; + scope 12 { } - scope 12 (inlined ptr::mut_ptr::::add) { - debug self => _7; - debug count => _3; - scope 13 { - } + } + scope 13 (inlined slice_from_raw_parts_mut::) { + debug data => _8; + debug len => _6; + let mut _9: *mut (); + scope 14 (inlined std::ptr::mut_ptr::::cast::<()>) { + debug self => _8; } - scope 14 (inlined slice_from_raw_parts_mut::) { - debug data => _8; - debug len => _6; - let mut _9: *mut (); - scope 15 (inlined ptr::mut_ptr::::cast::<()>) { - debug self => _8; - } - scope 16 (inlined std::ptr::from_raw_parts_mut::<[u32]>) { - debug data_address => _9; - debug metadata => _6; - let mut _10: *const (); - let mut _11: std::ptr::metadata::PtrComponents<[u32]>; - let mut _12: std::ptr::metadata::PtrRepr<[u32]>; - scope 17 { - } + scope 15 (inlined std::ptr::from_raw_parts_mut::<[u32]>) { + debug data_address => _9; + debug metadata => _6; + let mut _10: *const (); + let mut _11: std::ptr::metadata::PtrComponents<[u32]>; + let mut _12: std::ptr::metadata::PtrRepr<[u32]>; + scope 16 { } } } - scope 7 (inlined as SliceIndex<[T]>>::get_unchecked_mut::runtime::) { - debug ((this: std::ops::Range).0: usize) => _3; - debug ((this: std::ops::Range).1: usize) => _4; - debug slice => _5; - scope 8 (inlined ptr::mut_ptr::::len) { - debug self => _5; - let mut _14: *const [u32]; - scope 9 (inlined std::ptr::metadata::<[u32]>) { - debug ptr => _14; - scope 10 { - } - } - } + } + } + scope 6 (inlined std::ptr::mut_ptr::::len) { + debug self => _5; + let mut _15: *const [u32]; + scope 7 (inlined std::ptr::metadata::<[u32]>) { + debug ptr => _15; + scope 8 { } } } + scope 9 (inlined Arguments::<'_>::new_const) { + debug pieces => _14; + } } } } @@ -78,8 +73,9 @@ fn slice_get_unchecked_mut_range(_1: &mut [u32], _2: std::ops::Range) -> _4 = move (_2.1: usize); StorageLive(_5); _5 = &raw mut (*_1); - StorageLive(_6); StorageLive(_14); + StorageLive(_6); + StorageLive(_15); _6 = SubUnchecked(_4, _3); StorageLive(_8); StorageLive(_7); @@ -92,16 +88,17 @@ fn slice_get_unchecked_mut_range(_1: &mut [u32], _2: std::ops::Range) -> StorageLive(_11); StorageLive(_10); _10 = _9 as *const () (PointerCoercion(MutToConstPointer)); - _11 = ptr::metadata::PtrComponents::<[u32]> { data_address: move _10, metadata: _6 }; + _11 = std::ptr::metadata::PtrComponents::<[u32]> { data_address: move _10, metadata: _6 }; StorageDead(_10); - _12 = ptr::metadata::PtrRepr::<[u32]> { const_ptr: move _11 }; + _12 = std::ptr::metadata::PtrRepr::<[u32]> { const_ptr: move _11 }; StorageDead(_11); _13 = (_12.1: *mut [u32]); StorageDead(_12); StorageDead(_9); StorageDead(_8); - StorageDead(_14); + StorageDead(_15); StorageDead(_6); + StorageDead(_14); StorageDead(_5); _0 = &mut (*_13); return; diff --git a/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-abort.mir index 89009864c..c58b630a0 100644 --- a/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-abort.mir +++ b/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-abort.mir @@ -45,16 +45,16 @@ fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () { scope 14 { scope 15 (inlined NonNull::::new_unchecked::runtime::) { debug ptr => _9; - scope 16 (inlined ptr::mut_ptr::::is_null) { + scope 16 (inlined std::ptr::mut_ptr::::is_null) { debug self => _9; let mut _24: *mut u8; scope 17 { - scope 18 (inlined ptr::mut_ptr::::is_null::runtime_impl) { + scope 18 (inlined std::ptr::mut_ptr::::is_null::runtime_impl) { debug ptr => _24; - scope 19 (inlined ptr::mut_ptr::::addr) { + scope 19 (inlined std::ptr::mut_ptr::::addr) { debug self => _24; scope 20 { - scope 21 (inlined ptr::mut_ptr::::cast::<()>) { + scope 21 (inlined std::ptr::mut_ptr::::cast::<()>) { debug self => _24; } } @@ -71,7 +71,7 @@ fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () { scope 10 { } } - scope 11 (inlined ptr::const_ptr::::add) { + scope 11 (inlined std::ptr::const_ptr::::add) { debug self => _4; debug count => _6; scope 12 { diff --git a/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-unwind.mir index 3d76bab7c..1a805f0fd 100644 --- a/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-unwind.mir +++ b/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-unwind.mir @@ -45,16 +45,16 @@ fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () { scope 14 { scope 15 (inlined NonNull::::new_unchecked::runtime::) { debug ptr => _9; - scope 16 (inlined ptr::mut_ptr::::is_null) { + scope 16 (inlined std::ptr::mut_ptr::::is_null) { debug self => _9; let mut _24: *mut u8; scope 17 { - scope 18 (inlined ptr::mut_ptr::::is_null::runtime_impl) { + scope 18 (inlined std::ptr::mut_ptr::::is_null::runtime_impl) { debug ptr => _24; - scope 19 (inlined ptr::mut_ptr::::addr) { + scope 19 (inlined std::ptr::mut_ptr::::addr) { debug self => _24; scope 20 { - scope 21 (inlined ptr::mut_ptr::::cast::<()>) { + scope 21 (inlined std::ptr::mut_ptr::::cast::<()>) { debug self => _24; } } @@ -71,7 +71,7 @@ fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () { scope 10 { } } - scope 11 (inlined ptr::const_ptr::::add) { + scope 11 (inlined std::ptr::const_ptr::::add) { debug self => _4; debug count => _6; scope 12 { diff --git a/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-abort.mir index 146fa57a0..09075eed6 100644 --- a/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-abort.mir +++ b/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-abort.mir @@ -42,16 +42,16 @@ fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () { scope 14 { scope 15 (inlined NonNull::::new_unchecked::runtime::) { debug ptr => _9; - scope 16 (inlined ptr::mut_ptr::::is_null) { + scope 16 (inlined std::ptr::mut_ptr::::is_null) { debug self => _9; let mut _22: *mut u8; scope 17 { - scope 18 (inlined ptr::mut_ptr::::is_null::runtime_impl) { + scope 18 (inlined std::ptr::mut_ptr::::is_null::runtime_impl) { debug ptr => _22; - scope 19 (inlined ptr::mut_ptr::::addr) { + scope 19 (inlined std::ptr::mut_ptr::::addr) { debug self => _22; scope 20 { - scope 21 (inlined ptr::mut_ptr::::cast::<()>) { + scope 21 (inlined std::ptr::mut_ptr::::cast::<()>) { debug self => _22; } } @@ -68,7 +68,7 @@ fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () { scope 10 { } } - scope 11 (inlined ptr::const_ptr::::add) { + scope 11 (inlined std::ptr::const_ptr::::add) { debug self => _4; debug count => _6; scope 12 { diff --git a/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-unwind.mir index e8586cec9..47b847464 100644 --- a/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-unwind.mir +++ b/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-unwind.mir @@ -42,16 +42,16 @@ fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () { scope 14 { scope 15 (inlined NonNull::::new_unchecked::runtime::) { debug ptr => _9; - scope 16 (inlined ptr::mut_ptr::::is_null) { + scope 16 (inlined std::ptr::mut_ptr::::is_null) { debug self => _9; let mut _22: *mut u8; scope 17 { - scope 18 (inlined ptr::mut_ptr::::is_null::runtime_impl) { + scope 18 (inlined std::ptr::mut_ptr::::is_null::runtime_impl) { debug ptr => _22; - scope 19 (inlined ptr::mut_ptr::::addr) { + scope 19 (inlined std::ptr::mut_ptr::::addr) { debug self => _22; scope 20 { - scope 21 (inlined ptr::mut_ptr::::cast::<()>) { + scope 21 (inlined std::ptr::mut_ptr::::cast::<()>) { debug self => _22; } } @@ -68,7 +68,7 @@ fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () { scope 10 { } } - scope 11 (inlined ptr::const_ptr::::add) { + scope 11 (inlined std::ptr::const_ptr::::add) { debug self => _4; debug count => _6; scope 12 { diff --git a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-abort.mir index ac1de7b4c..db6922968 100644 --- a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-abort.mir +++ b/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-abort.mir @@ -39,7 +39,7 @@ fn range_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () { scope 8 { } } - scope 9 (inlined cmp::impls::::lt) { + scope 9 (inlined std::cmp::impls::::lt) { debug self => _7; debug other => _8; let mut _9: usize; diff --git a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir index 3c49ecf95..81d1832ee 100644 --- a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir +++ b/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir @@ -39,7 +39,7 @@ fn range_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () { scope 8 { } } - scope 9 (inlined cmp::impls::::lt) { + scope 9 (inlined std::cmp::impls::::lt) { debug self => _7; debug other => _8; let mut _9: usize; diff --git a/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-abort.mir index f3760463f..5ed7ca5e2 100644 --- a/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-abort.mir +++ b/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-abort.mir @@ -47,16 +47,16 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () { scope 14 { scope 15 (inlined NonNull::::new_unchecked::runtime::) { debug ptr => _9; - scope 16 (inlined ptr::mut_ptr::::is_null) { + scope 16 (inlined std::ptr::mut_ptr::::is_null) { debug self => _9; let mut _24: *mut u8; scope 17 { - scope 18 (inlined ptr::mut_ptr::::is_null::runtime_impl) { + scope 18 (inlined std::ptr::mut_ptr::::is_null::runtime_impl) { debug ptr => _24; - scope 19 (inlined ptr::mut_ptr::::addr) { + scope 19 (inlined std::ptr::mut_ptr::::addr) { debug self => _24; scope 20 { - scope 21 (inlined ptr::mut_ptr::::cast::<()>) { + scope 21 (inlined std::ptr::mut_ptr::::cast::<()>) { debug self => _24; } } @@ -73,7 +73,7 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () { scope 10 { } } - scope 11 (inlined ptr::const_ptr::::add) { + scope 11 (inlined std::ptr::const_ptr::::add) { debug self => _4; debug count => _6; scope 12 { diff --git a/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-unwind.mir index e63f8b893..bbb979d23 100644 --- a/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-unwind.mir +++ b/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-unwind.mir @@ -47,16 +47,16 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () { scope 14 { scope 15 (inlined NonNull::::new_unchecked::runtime::) { debug ptr => _9; - scope 16 (inlined ptr::mut_ptr::::is_null) { + scope 16 (inlined std::ptr::mut_ptr::::is_null) { debug self => _9; let mut _24: *mut u8; scope 17 { - scope 18 (inlined ptr::mut_ptr::::is_null::runtime_impl) { + scope 18 (inlined std::ptr::mut_ptr::::is_null::runtime_impl) { debug ptr => _24; - scope 19 (inlined ptr::mut_ptr::::addr) { + scope 19 (inlined std::ptr::mut_ptr::::addr) { debug self => _24; scope 20 { - scope 21 (inlined ptr::mut_ptr::::cast::<()>) { + scope 21 (inlined std::ptr::mut_ptr::::cast::<()>) { debug self => _24; } } @@ -73,7 +73,7 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () { scope 10 { } } - scope 11 (inlined ptr::const_ptr::::add) { + scope 11 (inlined std::ptr::const_ptr::::add) { debug self => _4; debug count => _6; scope 12 { -- cgit v1.2.3