mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #124978 - saethlin:ref-casting_derefs, r=Urgau,Nilstrieb

Browse Source 
Handle Deref expressions in invalid_reference_casting

Similar to https://github.com/rust-lang/rust/pull/124908

See https://github.com/rust-lang/rust/issues/124951 for context; this PR fixes the last of the known false postiive cases with this lint that we encounter in Crater.
This commit is contained in:
Matthias Krüger 2024-05-11 13:16:41 +02:00 committed by GitHub
commit 8eac6d2333
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_lint/src/reference_casting.rs
View File

@ -202,8 +202,10 @@ fn is_cast_to_bigger_memory_layout<'tcx>(
// if the current expr looks like this `&mut expr[index]` then just looking // if the current expr looks like this `&mut expr[index]` then just looking
// at `expr[index]` won't give us the underlying allocation, so we just skip it // at `expr[index]` won't give us the underlying allocation, so we just skip it
// the same logic applies field access like `&mut expr.field` // the same logic applies field access `&mut expr.field` and reborrows `&mut *expr`.
if let ExprKind::Index(..) | ExprKind::Field(..) = e_alloc.kind { if let ExprKind::Index(..) | ExprKind::Field(..) | ExprKind::Unary(UnOp::Deref, ..) =
e_alloc.kind
{
return None; return None;
} }

7
tests/ui/lint/reference_casting.rs
View File

@ -261,6 +261,13 @@ unsafe fn field_access(v: &mut Vec3<i32>) {
let ptr = r as *mut i32 as *mut Vec3<i32>; let ptr = r as *mut i32 as *mut Vec3<i32>;
unsafe { *ptr = Vec3(0, 0, 0) } unsafe { *ptr = Vec3(0, 0, 0) }
} }
unsafe fn deref(v: &mut Vec3<i32>) {
let r = &mut v.0;
let r = &mut *r;
let ptr = &mut *(r as *mut i32 as *mut Vec3<i32>);
unsafe { *ptr = Vec3(0, 0, 0) }
}
} }
const RAW_PTR: *mut u8 = 1 as *mut u8; const RAW_PTR: *mut u8 = 1 as *mut u8;