Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions crates/hir-ty/src/diagnostics/unsafe_check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,22 @@ impl<'db> UnsafeVisitor<'db> {
}
_ => (),
}

let mut peeled = *expr;
while let Expr::Field { expr: lhs, .. } = &self.body[peeled] {
if let Some(Either::Left(FieldId { parent: VariantId::UnionId(_), .. })) =
self.infer.field_resolution(peeled)
{
peeled = *lhs;
} else {
break;
}
}

// Walk the peeled expression (the LHS of the union field chain)
self.walk_expr(peeled);
// Return so we don't recurse directly onto the union field access(es)
return;
}
Expr::MethodCall { .. } => {
if let Some((func, _)) = self.infer.method_resolution(current) {
Expand Down
43 changes: 43 additions & 0 deletions crates/ide-diagnostics/src/handlers/missing_unsafe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,49 @@ fn main() {
)
}

#[test]
fn raw_deref_on_union_field() {
check_diagnostics(
r#"
fn main() {

union U {
a: u8
}
let x = U { a: 3 };

let a = &raw mut x.a;

union U1 {
a: u8
}
let x = U1 { a: 3 };

let a = x.a;
// ^^^ 💡 error: access to union field is unsafe and requires an unsafe function or block


let b = &raw const x.a;

let tmp = Vec::from([1, 2, 3]);

let c = &raw const tmp[x.a];
// ^^^ 💡 error: access to union field is unsafe and requires an unsafe function or block

union URef {
p: &'static mut i32,
}

fn deref_union_field(u: URef) {
// Not an assignment but an access to the union field!
*(u.p) = 13;
// ^^^ 💡 error: access to union field is unsafe and requires an unsafe function or block
}
}
"#,
)
}

#[test]
fn unsafe_expr_as_an_argument_of_a_method_call() {
check_fix(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@

<span class="variable">u</span><span class="operator">.</span><span class="field unsafe">field</span><span class="semicolon">;</span>
<span class="operator">&</span><span class="variable">u</span><span class="operator">.</span><span class="field unsafe">field</span><span class="semicolon">;</span>
<span class="operator">&</span><span class="keyword">raw</span> <span class="keyword const">const</span> <span class="variable">u</span><span class="operator">.</span><span class="field unsafe">field</span><span class="semicolon">;</span>
<span class="operator">&</span><span class="keyword">raw</span> <span class="keyword const">const</span> <span class="variable">u</span><span class="operator">.</span><span class="field">field</span><span class="semicolon">;</span>
<span class="comment">// this should be safe!</span>
<span class="keyword">let</span> <span class="union">Union</span> <span class="brace">{</span> <span class="field">field</span><span class="colon">:</span> <span class="punctuation">_</span> <span class="brace">}</span><span class="semicolon">;</span>
<span class="comment">// but not these</span>
Expand Down
Loading