From 5e785b1420d8d26f360a33919700868c877cbbbc Mon Sep 17 00:00:00 2001 From: Scott McMurray Date: Sun, 21 Apr 2024 11:24:54 -0700 Subject: [PATCH] Update tests after 123949 --- ...yte_add_fat.PreCodegen.after.panic-abort.mir | 10 ---------- ...te_add_fat.PreCodegen.after.panic-unwind.mir | 10 ---------- ...te_add_thin.PreCodegen.after.panic-abort.mir | 14 -------------- ...e_add_thin.PreCodegen.after.panic-unwind.mir | 14 -------------- ...ecked_range.PreCodegen.after.panic-abort.mir | 17 ----------------- ...cked_range.PreCodegen.after.panic-unwind.mir | 17 ----------------- 6 files changed, 82 deletions(-) diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-abort.mir index 37f50d25fc855..db0c84bd560fd 100644 --- a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-abort.mir +++ b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-abort.mir @@ -5,29 +5,19 @@ fn demo_byte_add_fat(_1: *const [u32], _2: usize) -> *const [u32] { debug n => _2; let mut _0: *const [u32]; scope 1 (inlined std::ptr::const_ptr::::byte_add) { - debug self => _1; - debug count => _2; let mut _3: *const u8; let mut _4: *const u8; scope 2 (inlined std::ptr::const_ptr::::cast::) { - debug self => _1; } scope 3 (inlined std::ptr::const_ptr::::add) { - debug self => _3; - debug count => _2; } scope 4 (inlined std::ptr::const_ptr::::with_metadata_of::<[u32]>) { - debug self => _4; - debug meta => _1; let mut _5: *const (); let mut _7: usize; scope 5 (inlined std::ptr::metadata::<[u32]>) { - debug ptr => _1; let mut _6: std::ptr::metadata::PtrRepr<[u32]>; } scope 6 (inlined std::ptr::from_raw_parts::<[u32]>) { - debug data_pointer => _5; - debug metadata => _7; } } } diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-unwind.mir index 37f50d25fc855..db0c84bd560fd 100644 --- a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-unwind.mir +++ b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-unwind.mir @@ -5,29 +5,19 @@ fn demo_byte_add_fat(_1: *const [u32], _2: usize) -> *const [u32] { debug n => _2; let mut _0: *const [u32]; scope 1 (inlined std::ptr::const_ptr::::byte_add) { - debug self => _1; - debug count => _2; let mut _3: *const u8; let mut _4: *const u8; scope 2 (inlined std::ptr::const_ptr::::cast::) { - debug self => _1; } scope 3 (inlined std::ptr::const_ptr::::add) { - debug self => _3; - debug count => _2; } scope 4 (inlined std::ptr::const_ptr::::with_metadata_of::<[u32]>) { - debug self => _4; - debug meta => _1; let mut _5: *const (); let mut _7: usize; scope 5 (inlined std::ptr::metadata::<[u32]>) { - debug ptr => _1; let mut _6: std::ptr::metadata::PtrRepr<[u32]>; } scope 6 (inlined std::ptr::from_raw_parts::<[u32]>) { - debug data_pointer => _5; - debug metadata => _7; } } } diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-abort.mir index 9551f30c7e932..766bd29ef41c7 100644 --- a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-abort.mir +++ b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-abort.mir @@ -5,27 +5,16 @@ fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 { debug n => _2; let mut _0: *const u32; scope 1 (inlined std::ptr::const_ptr::::byte_add) { - debug self => _1; - debug count => _2; let mut _3: *const u8; let mut _4: *const u8; scope 2 (inlined std::ptr::const_ptr::::cast::) { - debug self => _1; } scope 3 (inlined std::ptr::const_ptr::::add) { - debug self => _3; - debug count => _2; } scope 4 (inlined std::ptr::const_ptr::::with_metadata_of::) { - debug self => _4; - debug meta => _1; - let mut _5: *const (); scope 5 (inlined std::ptr::metadata::) { - debug ptr => _1; } scope 6 (inlined std::ptr::from_raw_parts::) { - debug data_pointer => _5; - debug metadata => const (); } } } @@ -35,10 +24,7 @@ fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 { _3 = _1 as *const u8 (PtrToPtr); _4 = Offset(_3, _2); StorageDead(_3); - StorageLive(_5); - _5 = _4 as *const () (PtrToPtr); _0 = _4 as *const u32 (PtrToPtr); - StorageDead(_5); return; } } diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-unwind.mir index 9551f30c7e932..766bd29ef41c7 100644 --- a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-unwind.mir +++ b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-unwind.mir @@ -5,27 +5,16 @@ fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 { debug n => _2; let mut _0: *const u32; scope 1 (inlined std::ptr::const_ptr::::byte_add) { - debug self => _1; - debug count => _2; let mut _3: *const u8; let mut _4: *const u8; scope 2 (inlined std::ptr::const_ptr::::cast::) { - debug self => _1; } scope 3 (inlined std::ptr::const_ptr::::add) { - debug self => _3; - debug count => _2; } scope 4 (inlined std::ptr::const_ptr::::with_metadata_of::) { - debug self => _4; - debug meta => _1; - let mut _5: *const (); scope 5 (inlined std::ptr::metadata::) { - debug ptr => _1; } scope 6 (inlined std::ptr::from_raw_parts::) { - debug data_pointer => _5; - debug metadata => const (); } } } @@ -35,10 +24,7 @@ fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 { _3 = _1 as *const u8 (PtrToPtr); _4 = Offset(_3, _2); StorageDead(_3); - StorageLive(_5); - _5 = _4 as *const () (PtrToPtr); _0 = _4 as *const u32 (PtrToPtr); - StorageDead(_5); return; } } diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-abort.mir index 8446324c663d5..018ff6c357d17 100644 --- a/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-abort.mir +++ b/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-abort.mir @@ -7,42 +7,25 @@ fn slice_ptr_get_unchecked_range(_1: *const [u32], _2: std::ops::Range) - let mut _3: usize; let mut _4: usize; scope 1 (inlined std::ptr::const_ptr::::get_unchecked::>) { - debug self => _1; - debug ((index: std::ops::Range).0: usize) => _3; - debug ((index: std::ops::Range).1: usize) => _4; scope 2 (inlined as SliceIndex<[u32]>>::get_unchecked) { - debug ((self: std::ops::Range).0: usize) => _3; - debug ((self: std::ops::Range).1: usize) => _4; - debug slice => _1; let _5: usize; let mut _6: *const u32; let mut _7: *const u32; scope 3 { - debug new_len => _5; scope 6 (inlined std::ptr::const_ptr::::as_ptr) { - debug self => _1; } scope 7 (inlined std::ptr::const_ptr::::add) { - debug self => _6; - debug count => _3; } scope 8 (inlined slice_from_raw_parts::) { - debug data => _7; - debug len => _5; let mut _8: *const (); scope 9 (inlined std::ptr::const_ptr::::cast::<()>) { - debug self => _7; } scope 10 (inlined std::ptr::from_raw_parts::<[u32]>) { - debug data_pointer => _8; - debug metadata => _5; } } } scope 4 (inlined std::ptr::const_ptr::::len) { - debug self => _1; scope 5 (inlined std::ptr::metadata::<[u32]>) { - debug ptr => _1; } } } diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-unwind.mir index 8446324c663d5..018ff6c357d17 100644 --- a/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-unwind.mir +++ b/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-unwind.mir @@ -7,42 +7,25 @@ fn slice_ptr_get_unchecked_range(_1: *const [u32], _2: std::ops::Range) - let mut _3: usize; let mut _4: usize; scope 1 (inlined std::ptr::const_ptr::::get_unchecked::>) { - debug self => _1; - debug ((index: std::ops::Range).0: usize) => _3; - debug ((index: std::ops::Range).1: usize) => _4; scope 2 (inlined as SliceIndex<[u32]>>::get_unchecked) { - debug ((self: std::ops::Range).0: usize) => _3; - debug ((self: std::ops::Range).1: usize) => _4; - debug slice => _1; let _5: usize; let mut _6: *const u32; let mut _7: *const u32; scope 3 { - debug new_len => _5; scope 6 (inlined std::ptr::const_ptr::::as_ptr) { - debug self => _1; } scope 7 (inlined std::ptr::const_ptr::::add) { - debug self => _6; - debug count => _3; } scope 8 (inlined slice_from_raw_parts::) { - debug data => _7; - debug len => _5; let mut _8: *const (); scope 9 (inlined std::ptr::const_ptr::::cast::<()>) { - debug self => _7; } scope 10 (inlined std::ptr::from_raw_parts::<[u32]>) { - debug data_pointer => _8; - debug metadata => _5; } } } scope 4 (inlined std::ptr::const_ptr::::len) { - debug self => _1; scope 5 (inlined std::ptr::metadata::<[u32]>) { - debug ptr => _1; } } }