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

Rollup of 4 iffy pull requests #91455

Merged
merged 12 commits into from
Dec 2, 2021
Merged

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Mark-Simulacrum and others added 12 commits November 30, 2021 10:44
... if they use arbitrary enum discriminant. Code like

```rust
enum Enum {
    Foo = 1,
    Bar(),
    Baz{}
}
```

seems to be unintentionally allowed so we couldn't disallow them now,
but we could disallow them if arbitrary enum discriminant is used before
1.56 hits stable.
Disallow non-c-like but "fieldless" ADTs from being casted to integer if they use arbitrary enum discriminant

Code like

```rust
#[repr(u8)]
enum Enum {
    Foo /* = 0 */,
    Bar(),
    Baz{}
}

let x = Enum::Bar() as u8;
```

seems to be unintentionally allowed so we couldn't disallow them now ~~, but we could disallow them if arbitrary enum discriminant is used before 1.56 hits stable~~ (stabilization was reverted).

Related: rust-lang#88621

`@rustbot` label +T-lang
…nkov

Issue 90702 fix: Stop treating some crate loading failures as fatal errors

Surface mulitple `extern crate` resolution errors at a time.

This is achieved by creating a dummy crate, instead of aborting directly after the resolution error. The `ExternCrateError` has been added to allow propagating the resolution error from `rustc_metadata` crate to the `rustc_resolve` with a minimal public surface. The `import_extern_crate` function is a block that was factored out from `build_reduced_graph_for_item` for better organization. The only added functionality made to it where the added error handling in the `process_extern_crate` call. The remaining bits in this function are the same as before.

Resolves rust-lang#90702

r? `@petrochenkov`
…roalbini

Bump stage0 compiler

r? `@pietroalbini` (or anyone else)
…nkov

Enable svh tests on msvc

These tests were ignored for msvc in rust-lang#30778 because of additional notes that were being added for some reason. I'm fairly confident this has been fixed in the intervening years so lets try re-enabling these tests.

Fixes rust-lang#31306
@rustbot rustbot added the rollup A PR which is a rollup label Dec 2, 2021
@matthiaskrgr matthiaskrgr changed the title Rollup of 4 pull requests Rollup of 4 iffy pull requests Dec 2, 2021
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Dec 2, 2021

📌 Commit 822a058 has been approved by matthiaskrgr

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 2, 2021
@bors
Copy link
Contributor

bors commented Dec 2, 2021

⌛ Testing commit 822a058 with merge e5038e2...

@bors
Copy link
Contributor

bors commented Dec 2, 2021

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing e5038e2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 2, 2021
@bors bors merged commit e5038e2 into rust-lang:master Dec 2, 2021
@rustbot rustbot added this to the 1.59.0 milestone Dec 2, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e5038e2): comparison url.

Summary: This change led to very large relevant mixed results 🤷 in compiler performance.

  • Very large improvement in instruction counts (up to -6.7% on incr-unchanged builds of clap-rs)
  • Large regression in instruction counts (up to 3.4% on incr-unchanged builds of clap-rs)

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

@rustbot rustbot added the perf-regression Performance regression. label Dec 2, 2021
@matthiaskrgr
Copy link
Member Author

Mmh, I would assume we benchmark the stage2 compiler anyway so bootstrap bump should not have a big effect, so probably one of the first two..?

@rylev
Copy link
Member

rylev commented Dec 7, 2021

@matthiaskrgr for the future, it's usually good to not group iffy pull requests into the same PR. It's better to group an iffy PR with other clearly non-performance sensitive PRs so that if a perf regression happens, you can go with the hypothesis that the iffy PR caused the regression. It'll likely be too difficult to figure out the cause of the regression given how small the regression actually is (0.8% is the largest regression in a non-noisy test case).

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Dec 7, 2021
@matthiaskrgr
Copy link
Member Author

@rylev isn't that was rollup=never is for?
IMO iffy signals that this "might" pass in ci but it is not certain, so if you want a rollup that has high likelyhood of merging, don't include iffy prs.
If a PR is sensitive to perf, it should be marked rollup=never for exactly this reason and make it easier to figure out later on.

@matthiaskrgr matthiaskrgr deleted the rollup-gix2hy6 branch December 12, 2021 09:58
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. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants