diff options
| author | bors <bors@rust-lang.org> | 2023-06-16 21:14:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-16 21:14:24 +0000 |
| commit | 670a0edaa9d80683df8db81554890710e79f8024 (patch) | |
| tree | 4bbbcd5f4ab51712cefa538eeaed165118fc94b9 /compiler/rustc_mir_transform/src | |
| parent | 6bba061467f7c2cab04b262b95eb67bf89265587 (diff) | |
| parent | 56c96d755262be18788191c1f6cddeeae7911379 (diff) | |
| download | rust-670a0edaa9d80683df8db81554890710e79f8024.tar.gz rust-670a0edaa9d80683df8db81554890710e79f8024.zip | |
Auto merge of #112716 - compiler-errors:rollup-h77daia, r=compiler-errors
Rollup of 7 pull requests Successful merges: - #111074 (Relax implicit `T: Sized` bounds on `BufReader<T>`, `BufWriter<T>` and `LineWriter<T>`) - #112226 (std: available_parallelism using native netbsd api first) - #112474 (Support 128-bit enum variant in debuginfo codegen) - #112662 (`#[lang_item]` for `core::ptr::Unique`) - #112665 (Make assumption functions in new solver take `Binder<'tcx, Clause<'tcx>>`) - #112684 (Disable alignment checks on i686-pc-windows-msvc) - #112706 (Add `SyntaxContext::is_root`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/check_alignment.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_mir_transform/src/check_alignment.rs b/compiler/rustc_mir_transform/src/check_alignment.rs index ef64f70fdf3..fd349c07040 100644 --- a/compiler/rustc_mir_transform/src/check_alignment.rs +++ b/compiler/rustc_mir_transform/src/check_alignment.rs @@ -15,6 +15,10 @@ pub struct CheckAlignment; impl<'tcx> MirPass<'tcx> for CheckAlignment { fn is_enabled(&self, sess: &Session) -> bool { + // FIXME(#112480) MSVC and rustc disagree on minimum stack alignment on x86 Windows + if sess.target.llvm_target == "i686-pc-windows-msvc" { + return false; + } sess.opts.debug_assertions } |