diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-09-06 19:31:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-06 19:31:50 +0200 |
| commit | 3e42a12a54df8e3ff4c70441d77a34b4dd104b26 (patch) | |
| tree | 97509213cdb90b8221856e95361a58045d495dc2 /compiler/rustc_mir_transform/src | |
| parent | 93543bc8bc9e64f3b8b9aa23310dcf9a0a34dd64 (diff) | |
| parent | cfa211956309a444371442c5956d59a12260dcee (diff) | |
| download | rust-3e42a12a54df8e3ff4c70441d77a34b4dd104b26.tar.gz rust-3e42a12a54df8e3ff4c70441d77a34b4dd104b26.zip | |
Rollup merge of #115587 - mojave2:issue-115348, r=oli-obk
fix #115348 fix #115348 It looks that: - In `rustc_mir_build::build`, the body of function will not be built, when the `tcx.check_match(def)` fails due to `non-exhaustive patterns` - In `rustc_mir_transform::check_unsafety`, the `UnsafetyChecker` collects all `used_unsafe_blocks` in the MIR of a function, and the `UnusedUnsafeVisitor` will visit all `UnsafeBlock`s in the HIR and collect `unused_unsafes`, which are not contained in `used_unsafe_blocks`, and report `unnecessary_unsafe`s - So the unsafe block in the issue example code will be reported as `unnecessary_unsafe`.
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(), |