OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix some incorrect aliasing in the BTree

Browse Source
This commit is contained in:
Ralf Jung 2020-10-28 09:05:45 +01:00
parent 824f900a96
commit b0df3f76dc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/alloc/src/collections/btree/node.rs
View File

@ -1608,15 +1608,19 @@ pub mod marker {
unsafe fn slice_insert<T>(slice: &mut [T], idx: usize, val: T) { unsafe fn slice_insert<T>(slice: &mut [T], idx: usize, val: T) {
unsafe { unsafe {
ptr::copy(slice.as_ptr().add(idx), slice.as_mut_ptr().add(idx + 1), slice.len() - idx); let len = slice.len();
ptr::write(slice.get_unchecked_mut(idx), val); let slice_ptr = slice.as_mut_ptr();
ptr::copy(slice_ptr.add(idx), slice_ptr.add(idx + 1), len - idx);
ptr::write(slice_ptr.add(idx), val);
} }
} }
unsafe fn slice_remove<T>(slice: &mut [T], idx: usize) -> T { unsafe fn slice_remove<T>(slice: &mut [T], idx: usize) -> T {
unsafe { unsafe {
let ret = ptr::read(slice.get_unchecked(idx)); let len = slice.len();
ptr::copy(slice.as_ptr().add(idx + 1), slice.as_mut_ptr().add(idx), slice.len() - idx - 1); let slice_ptr = slice.as_mut_ptr();
let ret = ptr::read(slice_ptr.add(idx));
ptr::copy(slice_ptr.add(idx + 1), slice_ptr.add(idx), len - idx - 1);
ret ret
} }
} }