Disable alignment checks on i686-pc-windows-msvc by saethlin · Pull Request #112684 · rust-lang/rust

saethlin · 2023-06-15T23:34:03Z

r? @wesleywiser Because you were in the Zulip discussion of this: https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings/topic/.5Bweekly.5D.202023-06-15

cc #112480

rustbot · 2023-06-15T23:34:10Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

saethlin · 2023-06-15T23:48:56Z

Thanks for the tweak. I was thinking it would be good to cite something but I wasn't sure where.

wesleywiser · 2023-06-15T23:49:39Z

You're welcome. Thanks for the quick turn around on this!

@bors r+ rollup

bors · 2023-06-15T23:49:40Z

📌 Commit 55d680b has been approved by wesleywiser

It is now in the queue for this repository.

… r=wesleywiser Disable alignment checks on i686-pc-windows-msvc r? `@wesleywiser` Because you were in the Zulip discussion of this: https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings/topic/.5Bweekly.5D.202023-06-15 cc rust-lang#112480

scottmcm · 2023-06-16T05:54:21Z

 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" {


Is this potentially going to make some of the MIR tests for this fail on i686-msvc? Are there any tests that should get something like a ignore-i686-pc-windows-msvc?

I think just the test for the alignment check itself. The mir-opt tests have debug assertions disabled and I think I was otherwise pretty careful to modify the other tests so that they are not perturbed by them, but that was some time ago.
I'd prefer to be able to run the msvc test suite locally but I don't think that's supported on a Linux host?

compiler-errors · 2023-06-16T06:07:07Z

@bors r- failed in rollup: #112689 (comment)

oli-obk · 2023-06-16T13:22:34Z

@bors r=wesleywiser

bors · 2023-06-16T13:22:36Z

📌 Commit c54672e has been approved by wesleywiser

It is now in the queue for this repository.

wesleywiser · 2023-06-16T13:55:37Z

@bors r+

bors · 2023-06-16T13:55:39Z

📌 Commit 4ef316f has been approved by wesleywiser

It is now in the queue for this repository.

…mpiler-errors Rollup of 7 pull requests Successful merges: - rust-lang#111074 (Relax implicit `T: Sized` bounds on `BufReader<T>`, `BufWriter<T>` and `LineWriter<T>`) - rust-lang#112226 (std: available_parallelism using native netbsd api first) - rust-lang#112474 (Support 128-bit enum variant in debuginfo codegen) - rust-lang#112662 (`#[lang_item]` for `core::ptr::Unique`) - rust-lang#112665 (Make assumption functions in new solver take `Binder<'tcx, Clause<'tcx>>`) - rust-lang#112684 (Disable alignment checks on i686-pc-windows-msvc) - rust-lang#112706 (Add `SyntaxContext::is_root`) r? `@ghost` `@rustbot` modify labels: rollup

apiraino · 2023-06-22T14:17:53Z

Backports approved as per compiler team on Zulip

@rustbot label +beta-accepted +stable-accepted

…k-Simulacrum [beta] backport This PR backports: - rust-lang#112684: Disable alignment checks on i686-pc-windows-msvc - rust-lang#112581: [rustdoc] Fix URL encoding of % sign - rust-lang#112312: Update to LLVM 16.0.5 - rust-lang#112266: Fix type-inference regression in rust-lang#112225 - rust-lang#112062: Make struct layout not depend on unsizeable tail r? `@Mark-Simulacrum`

RalfJung · 2023-07-05T20:36:33Z

I don't understand why the tags here indicate a stable backport? #98112 is on the 1.70 train, this here landed for the 1.71 train, so a beta backport should be sufficient.

ChrisDenton · 2023-07-05T20:42:53Z

Because if there were a 1.70.1 release then it would be worth including it.

RalfJung · 2023-07-05T20:44:57Z

Oh, when I said this landed on the 1.71 train I was wrong -- the milestone in this PR got changed and no longer reflects the train it originally landed in. That lead me down the wrong trail. This landed in the 1.72 train.

rustbot assigned wesleywiser Jun 15, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 15, 2023

wesleywiser approved these changes Jun 15, 2023
View reviewed changes

Comment threadcompiler/rustc_mir_transform/src/check_alignment.rs

wesleywiser added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Jun 15, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 15, 2023

matthiaskrgr mentioned this pull request Jun 16, 2023
Rollup of 8 pull requests #112689
Closed

scottmcm reviewed Jun 16, 2023
View reviewed changes

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 16, 2023

saethlin force-pushed the ignore-windows-alignment branch from 55d680b to 0a445afCompare June 16, 2023 13:05

Disable alignment checks on i686-pc-windows-msvc
c54672e

saethlin force-pushed the ignore-windows-alignment branch from 0a445af to c54672eCompare June 16, 2023 13:06

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 16, 2023

wesleywiser approved these changes Jun 16, 2023
View reviewed changes

Comment threadcompiler/rustc_mir_transform/src/check_alignment.rs

Update compiler/rustc_mir_transform/src/check_alignment.rs
4ef316f

compiler-errors mentioned this pull request Jun 16, 2023
Rollup of 7 pull requests #112716
Merged

bors merged commit a5f8859 into rust-lang:masterJun 17, 2023

rustbot added this to the 1.72.0 milestone Jun 17, 2023

rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Jun 22, 2023

Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 24, 2023

Mark-Simulacrum modified the milestones: 1.72.0, 1.71.0 Jun 24, 2023

Mark-Simulacrum mentioned this pull request Jun 24, 2023
[beta] backport #113000
Merged

saethlin deleted the ignore-windows-alignment branch June 27, 2023 02:23

GuillaumeGomez mentioned this pull request Jul 5, 2023
32bit debug builds panic (misaligned pointer dereference:) GuillaumeGomez/sysinfo#1001
Closed

RalfJung mentioned this pull request Jul 5, 2023
winapi crashes on x86 because of conflicting stack alignment assumptions retep998/winapi-rs#1043
Open

Mark-Simulacrum removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Jul 21, 2023

Uh oh!

Uh oh!

Conversation

saethlin commented Jun 15, 2023• edited by wesleywiser Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 15, 2023

Uh oh!

Uh oh!

saethlin commented Jun 15, 2023

Uh oh!

wesleywiser commented Jun 15, 2023

Uh oh!

bors commented Jun 15, 2023

Uh oh!

scottmcmJun 16, 2023

Choose a reason for hiding this comment

Uh oh!

saethlinJun 16, 2023

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Jun 16, 2023

Uh oh!

oli-obk commented Jun 16, 2023

Uh oh!

bors commented Jun 16, 2023

Uh oh!

Uh oh!

wesleywiser commented Jun 16, 2023

Uh oh!

bors commented Jun 16, 2023

Uh oh!

apiraino commented Jun 22, 2023

Uh oh!

RalfJung commented Jul 5, 2023

Uh oh!

ChrisDenton commented Jul 5, 2023

Uh oh!

RalfJung commented Jul 5, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

saethlin commented Jun 15, 2023•
edited by wesleywiser
Loading

RalfJung commented Jul 5, 2023•
edited
Loading