Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable MIR SROA optimization by default #115140

Merged
merged 1 commit into from Aug 23, 2023

Conversation

wesleywiser
Copy link
Member

Turn off the MIR SROA optimization by default to prevent incorrect debuginfo generation and rustc ICEs caused by invalid LLVM IR being created.

Related to #115113

r? @cuviper
cc @saethlin

@rustbot
Copy link
Collaborator

rustbot commented Aug 23, 2023

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. Please double check that you specified the right target!

@rustbot 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 Aug 23, 2023
@rustbot
Copy link
Collaborator

rustbot commented Aug 23, 2023

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@saethlin
Copy link
Member

I think you'll need to re-bless the mir-opt tests to get CI to pass?

@wesleywiser
Copy link
Member Author

They all passed without modification locally? 🤔

@cuviper
Copy link
Member

cuviper commented Aug 23, 2023

I get:

failures:
    [mir-opt] tests/mir-opt/inline/inline_into_box_place.rs
    [mir-opt] tests/mir-opt/pre-codegen/checked_ops.rs
    [mir-opt] tests/mir-opt/pre-codegen/mem_replace.rs
    [mir-opt] tests/mir-opt/pre-codegen/slice_index.rs
    [mir-opt] tests/mir-opt/pre-codegen/slice_iter.rs
    [mir-opt] tests/mir-opt/pre-codegen/simple_option_map.rs

Turn off the MIR SROA optimization by default to prevent incorrect
debuginfo generation and rustc ICEs caused by invalid LLVM IR being
created.

Related to rust-lang#115113
@wesleywiser
Copy link
Member Author

The issue was that I had debug-assertions = true in my config.toml and that ignores a number of MIR opt tests, including the ones that failed for @cuviper.

@cuviper
Copy link
Member

cuviper commented Aug 23, 2023

@bors r+ rollup=never p=10

@bors
Copy link
Contributor

bors commented Aug 23, 2023

📌 Commit 298ec52 has been approved by cuviper

It is now in the queue for this repository.

@bors 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 Aug 23, 2023
@glandium
Copy link
Contributor

Is 1.72 going to be respun with this fix or will there be a followup 1.72.1?

@cuviper
Copy link
Member

cuviper commented Aug 23, 2023

I believe this will get in for 1.72.0. The CI dist builds here are what get promoted, no further respin necessary.

@bors
Copy link
Contributor

bors commented Aug 23, 2023

⌛ Testing commit 298ec52 with merge 5680fa1...

@bors
Copy link
Contributor

bors commented Aug 23, 2023

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 5680fa1 to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 23, 2023
@bors bors merged commit 5680fa1 into rust-lang:stable Aug 23, 2023
12 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Aug 23, 2023
@glandium
Copy link
Contributor

Is it expected that https://dev-static.rust-lang.org/dist/channel-rust-stable.toml still points to 6301e8c?

@Mark-Simulacrum
Copy link
Member

@glandium yeah, rebuilding dev-static is a manual step that we haven't taken. Real stable will point at the tip of stable branch when it gets built later today.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants