bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

never consider unsafe blocks unused if they would be required with unsafe_op_in_unsafe_fn

Browse source
This commit is contained in:
Ralf Jung 2022-08-02 15:47:14 -04:00
parent 4493a0f472
commit ee3fc9dff8
10 changed files with 124 additions and 631 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,10 +75,10 @@ impl<'tcx> UnsafetyVisitor<'_, 'tcx> {
match self.safety_context {
SafetyContext::BuiltinUnsafeBlock => {}
SafetyContext::UnsafeBlock { ref mut used, .. } => {
if !self.body_unsafety.is_unsafe() || !unsafe_op_in_unsafe_fn_allowed {
// Mark this block as useful
*used = true;
}
// Mark this block as useful (even inside `unsafe fn`, where it is technically
// redundant -- but we want to eventually enable `unsafe_op_in_unsafe_fn` by
// default which will require those blocks).
*used = true;
}
SafetyContext::UnsafeFn if unsafe_op_in_unsafe_fn_allowed => {}
SafetyContext::UnsafeFn => {