Skip to content

Commit

Permalink
Make test ptr::slice_mut compliant with Tree Borrows
Browse files Browse the repository at this point in the history
Tree Borrows is a new aliasing model for Rust, which features more precise
tracking of pointer aliasing. The aim is to be more lenient than Stacked Borrows,
while also having less dirty hacks than SB had.

It turns out that the test ptr::slice_mut here relied on one such gross hack.

The problematic code is here:
https://github.com/lumol-org/soa-derive/blob/ad918be58f47ee6d38e9c83411180e756a3220c0/tests/ptr.rs#L77-L93
There, a slice is created, and then a reference to it is obtained using
`slice::as_mut_ptr()`, which (internally) creates a new mutable
reference. This means that the resulting pointer can not be mixed with
accesses to the original slice.

However, the test does so: It first uses the pointer, then the original
slice, and then again the pointer. The proper solution is to re-derive
the pointer when it's needed again, which is what this PR does.
  • Loading branch information
JoJoDeveloping authored and Luthaf committed Aug 26, 2024
1 parent ad918be commit c5fd944
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ fn slice_mut() {
assert_eq!(slice.mass[0], 42.0);

unsafe {
let slice = ParticleSliceMut::from_raw_parts_mut(ptr, 2);
let slice = ParticleSliceMut::from_raw_parts_mut(slice.as_mut_ptr(), 2);

for mass in slice.mass {
*mass = -1.0;
Expand Down

0 comments on commit c5fd944

Please sign in to comment.