diff options
| author | Ralf Jung <post@ralfj.de> | 2023-06-17 17:42:18 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2023-06-17 17:42:18 +0200 |
| commit | 14155e95b14495e1713da596cef337c64e1e9f3e (patch) | |
| tree | b95862aa9f90c4103b873905c729d3364e280bc5 /compiler/rustc_mir_transform/src/check_alignment.rs | |
| parent | dfd5037fa5bea87da79eace69fb6b0c3335f1fd6 (diff) | |
| parent | b866113d1918e64140bf15647850373d5a3bbe62 (diff) | |
| download | rust-14155e95b14495e1713da596cef337c64e1e9f3e.tar.gz rust-14155e95b14495e1713da596cef337c64e1e9f3e.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_mir_transform/src/check_alignment.rs')
| -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 } |