bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Extract shared logic into a new function

Browse source
This commit is contained in:
Gary Guo 2022-12-13 02:34:43 +00:00
parent d2830cb204
commit d6dc9124b7
1 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -132,6 +132,18 @@ impl<'tcx> UnsafetyVisitor<'_, 'tcx> {
fn unsafe_op_in_unsafe_fn_allowed(&self) -> bool { fn unsafe_op_in_unsafe_fn_allowed(&self) -> bool {
self.tcx.lint_level_at_node(UNSAFE_OP_IN_UNSAFE_FN, self.hir_context).0 == Level::Allow self.tcx.lint_level_at_node(UNSAFE_OP_IN_UNSAFE_FN, self.hir_context).0 == Level::Allow
} }
/// Handle closures/generators/inline-consts, which is unsafecked with their parent body.
fn visit_inner_body(&mut self, def: ty::WithOptConstParam<LocalDefId>) {
if let Ok((inner_thir, expr)) = self.tcx.thir_body(def) {
let inner_thir = &inner_thir.borrow();
let hir_context = self.tcx.hir().local_def_id_to_hir_id(def.did);
let mut inner_visitor = UnsafetyVisitor { thir: inner_thir, hir_context, ..*self };
inner_visitor.visit_expr(&inner_thir[expr]);
// Unsafe blocks can be used in the inner body, make sure to take it into account
self.safety_context = inner_visitor.safety_context;
}
}
} }
// Searches for accesses to layout constrained fields. // Searches for accesses to layout constrained fields.
@ -408,29 +420,11 @@ impl<'a, 'tcx> Visitor<'a, 'tcx> for UnsafetyVisitor<'a, 'tcx> {
} else { } else {
ty::WithOptConstParam::unknown(closure_id) ty::WithOptConstParam::unknown(closure_id)
}; };
if let Ok((closure_thir, expr)) = self.tcx.thir_body(closure_def) { self.visit_inner_body(closure_def);
let closure_thir = &closure_thir.borrow();
let hir_context = self.tcx.hir().local_def_id_to_hir_id(closure_id);
let mut closure_visitor =
UnsafetyVisitor { thir: closure_thir, hir_context, ..*self };
closure_visitor.visit_expr(&closure_thir[expr]);
// Unsafe blocks can be used in closures, make sure to take it into account
self.safety_context = closure_visitor.safety_context;
}
} }
ExprKind::ConstBlock { did, substs: _ } => { ExprKind::ConstBlock { did, substs: _ } => {
let def_id = did.expect_local(); let def_id = did.expect_local();
if let Ok((inner_thir, expr)) = self.visit_inner_body(ty::WithOptConstParam::unknown(def_id));
self.tcx.thir_body(ty::WithOptConstParam::unknown(def_id))
{
let inner_thir = &inner_thir.borrow();
let hir_context = self.tcx.hir().local_def_id_to_hir_id(def_id);
let mut inner_visitor =
UnsafetyVisitor { thir: inner_thir, hir_context, ..*self };
inner_visitor.visit_expr(&inner_thir[expr]);
// Unsafe blocks can be used in inline consts, make sure to take it into account
self.safety_context = inner_visitor.safety_context;
}
} }
ExprKind::Field { lhs, .. } => { ExprKind::Field { lhs, .. } => {
let lhs = &self.thir[lhs]; let lhs = &self.thir[lhs];