diff options
| author | bors <bors@rust-lang.org> | 2023-05-01 20:35:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-01 20:35:53 +0000 |
| commit | d6ddee637b62c6c4cdee90d98c3a21a1325a8e81 (patch) | |
| tree | 4be608ba309b622a1f66a912b261179c1595a291 /compiler/rustc_mir_transform/src | |
| parent | dbba594575ce75b1b57ccb1e4223b9909a28b1b8 (diff) | |
| parent | 15eebac9d962fa7510f4729f85e57c46a39c3ea1 (diff) | |
| download | rust-d6ddee637b62c6c4cdee90d98c3a21a1325a8e81.tar.gz rust-d6ddee637b62c6c4cdee90d98c3a21a1325a8e81.zip | |
Auto merge of #111066 - matthiaskrgr:rollup-4k6rj23, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #109540 (std docs: edit `PathBuf::set_file_name` example) - #110093 (Add 64-bit `time_t` support on 32-bit glibc Linux to `set_times`) - #110987 (update wasi_clock_time_api ref.) - #111038 (Leave promoteds untainted by errors when borrowck fails) - #111042 (Add `#[no_coverage]` to the test harness's `fn main`) - #111057 (Make sure the implementation of TcpStream::as_raw_fd is fully inlined) - #111065 (Explicitly document how Send and Sync relate to references) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/lib.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/rustc_mir_transform/src/lib.rs b/compiler/rustc_mir_transform/src/lib.rs index 25d7db0ee60..8d9a22ea30d 100644 --- a/compiler/rustc_mir_transform/src/lib.rs +++ b/compiler/rustc_mir_transform/src/lib.rs @@ -616,13 +616,10 @@ fn promoted_mir(tcx: TyCtxt<'_>, def: LocalDefId) -> &IndexVec<Promoted, Body<'_ return tcx.arena.alloc(IndexVec::new()); } - let tainted_by_errors = tcx.mir_borrowck(def).tainted_by_errors; + tcx.ensure_with_value().mir_borrowck(def); let mut promoted = tcx.mir_promoted(def).1.steal(); for body in &mut promoted { - if let Some(error_reported) = tainted_by_errors { - body.tainted_by_errors = Some(error_reported); - } run_analysis_to_runtime_passes(tcx, body); } |
