Rollup merge of #130531 - compiler-errors:thir-unsafeck-param, r=Urgau

Check params for unsafety in THIR

Self-explanatory. I'm not surprised this was overlooked, given the way that THIR visitors work. Perhaps we should provide a better entrypoint.

Fixes #130528
This commit is contained in:
Jubilee 2024-09-18 23:40:29 -07:00 committed by GitHub
commit 944df8e40f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 52 additions and 0 deletions

View File

@ -218,6 +218,13 @@ impl<'tcx> UnsafetyVisitor<'_, 'tcx> {
warnings: self.warnings, warnings: self.warnings,
suggest_unsafe_block: self.suggest_unsafe_block, suggest_unsafe_block: self.suggest_unsafe_block,
}; };
// params in THIR may be unsafe, e.g. a union pattern.
for param in &inner_thir.params {
if let Some(param_pat) = param.pat.as_deref() {
inner_visitor.visit_pat(param_pat);
}
}
// Visit the body.
inner_visitor.visit_expr(&inner_thir[expr]); inner_visitor.visit_expr(&inner_thir[expr]);
// Unsafe blocks can be used in the inner body, make sure to take it into account // Unsafe blocks can be used in the inner body, make sure to take it into account
self.safety_context = inner_visitor.safety_context; self.safety_context = inner_visitor.safety_context;
@ -1032,6 +1039,13 @@ pub(crate) fn check_unsafety(tcx: TyCtxt<'_>, def: LocalDefId) {
warnings: &mut warnings, warnings: &mut warnings,
suggest_unsafe_block: true, suggest_unsafe_block: true,
}; };
// params in THIR may be unsafe, e.g. a union pattern.
for param in &thir.params {
if let Some(param_pat) = param.pat.as_deref() {
visitor.visit_pat(param_pat);
}
}
// Visit the body.
visitor.visit_expr(&thir[expr]); visitor.visit_expr(&thir[expr]);
warnings.sort_by_key(|w| w.block_span); warnings.sort_by_key(|w| w.block_span);

View File

@ -0,0 +1,19 @@
union U {
a: &'static i32,
b: usize,
}
fn fun(U { a }: U) {
//~^ ERROR access to union field is unsafe
dbg!(*a);
}
fn main() {
fun(U { b: 0 });
let closure = |U { a }| {
//~^ ERROR access to union field is unsafe
dbg!(*a);
};
closure(U { b: 0 });
}

View File

@ -0,0 +1,19 @@
error[E0133]: access to union field is unsafe and requires unsafe function or block
--> $DIR/union-pat-in-param.rs:6:12
|
LL | fn fun(U { a }: U) {
| ^ access to union field
|
= note: the field may not be properly initialized: using uninitialized data will cause undefined behavior
error[E0133]: access to union field is unsafe and requires unsafe function or block
--> $DIR/union-pat-in-param.rs:14:24
|
LL | let closure = |U { a }| {
| ^ access to union field
|
= note: the field may not be properly initialized: using uninitialized data will cause undefined behavior
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0133`.