bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix aliasing in remove()

Browse source 
also add smoke test to detect relocation even in rustc runs
This commit is contained in:
Ralf Jung 2020-03-30 13:11:37 +02:00
parent 4eacf45c9c
commit 8f479e362f
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/liballoc/vec.rs
View file

@ -1200,7 +1200,7 @@ impl<T> Vec<T> {
} else {
unsafe {
self.len -= 1;
Some(ptr::read(self.get_unchecked(self.len())))
Some(ptr::read(self.as_ptr().add(self.len())))
}
}
}
@ -2020,9 +2020,7 @@ where
let (lower, _) = iterator.size_hint();
let mut vector = Vec::with_capacity(lower.saturating_add(1));
unsafe {
// `vector` is new, cannot have aliases, so us getting exclusive references
// here is okay.
ptr::write(vector.get_unchecked_mut(0), element);
ptr::write(vector.as_mut_ptr(), element);
vector.set_len(1);
}
vector