bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Check whether the closure's owner has a body before deferring to it in thir-unsafeck

Browse source
This commit is contained in:
Fabian Wolff 2021-06-08 17:19:16 +02:00
parent a50d72158e
commit 433c1aec21
2 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_mir_build/src/check_unsafety.rs
View file

@ -368,10 +368,15 @@ pub fn check_unsafety<'tcx>(tcx: TyCtxt<'tcx>, def: ty::WithOptConstParam<LocalD
return;
}
// Closures are handled by their parent function
// Closures are handled by their owner, if it has a body
if tcx.is_closure(def.did.to_def_id()) {
tcx.ensure().thir_check_unsafety(tcx.hir().local_def_id_to_hir_id(def.did).owner);
return;
let owner = tcx.hir().local_def_id_to_hir_id(def.did).owner;
let owner_hir_id = tcx.hir().local_def_id_to_hir_id(owner);
if tcx.hir().maybe_body_owned_by(owner_hir_id).is_some() {
tcx.ensure().thir_check_unsafety(owner);
return;
}
}
let (thir, expr) = tcx.thir_body(def);