bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix unsafetyck disabling for custom MIR

Browse source
This commit is contained in:
Jakob Degen 2022-12-03 23:54:55 -08:00
parent 21ee03e062
commit c1b27eea45
4 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_middle/src/mir/mod.rs
View file

@ -533,6 +533,11 @@ impl<'tcx> Body<'tcx> {
};
injection_phase > self.phase
}
#[inline]
pub fn is_custom_mir(&self) -> bool {
self.injection_phase.is_some()
}
}
#[derive(Copy, Clone, PartialEq, Eq, Debug, TyEncodable, TyDecodable, HashStable)]

2
compiler/rustc_mir_transform/src/check_unsafety.rs
View file

@ -500,7 +500,7 @@ fn unsafety_check_result<'tcx>(
// `mir_built` force this.
let body = &tcx.mir_built(def).borrow();
if body.should_skip() {
if body.is_custom_mir() {
return tcx.arena.alloc(UnsafetyCheckResult {
violations: Vec::new(),
used_unsafe_blocks: FxHashSet::default(),