diff options
| author | bors <bors@rust-lang.org> | 2023-09-06 18:16:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-06 18:16:06 +0000 |
| commit | 4e2116296cf48022e8be4caac71a7796015aa3d7 (patch) | |
| tree | 35481463ac97a31c378f4ccf8cbe44b087b85404 /compiler/rustc_mir_transform/src | |
| parent | a5b2ac6906d2b688db4938f842057cde6054449c (diff) | |
| parent | 1d3451d4950b3eafb854481de7d58878ae48dffd (diff) | |
| download | rust-4e2116296cf48022e8be4caac71a7796015aa3d7.tar.gz rust-4e2116296cf48022e8be4caac71a7796015aa3d7.zip | |
Auto merge of #115615 - matthiaskrgr:rollup-49fosdf, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #114511 (Remove the unhelpful let binding diag comes from FormatArguments) - #115473 (Add explanatory note to 'expected item' error) - #115574 (Replace `rustc_data_structures` dependency with `rustc_index` in `rustc_parse_format`) - #115578 (Clarify cryptic comments) - #115587 (fix #115348) - #115596 (A small change) - #115598 (Fix log formatting in bootstrap) - #115605 (Better Debug for `Ty` in smir) - #115614 (Fix minor grammar typo) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/check_unsafety.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_mir_transform/src/check_unsafety.rs b/compiler/rustc_mir_transform/src/check_unsafety.rs index 0fce9cb19a8..d5af321d726 100644 --- a/compiler/rustc_mir_transform/src/check_unsafety.rs +++ b/compiler/rustc_mir_transform/src/check_unsafety.rs @@ -483,7 +483,7 @@ fn unsafety_check_result(tcx: TyCtxt<'_>, def: LocalDefId) -> &UnsafetyCheckResu // `mir_built` force this. let body = &tcx.mir_built(def).borrow(); - if body.is_custom_mir() { + if body.is_custom_mir() || body.tainted_by_errors.is_some() { return tcx.arena.alloc(UnsafetyCheckResult { violations: Vec::new(), used_unsafe_blocks: Default::default(), |