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

allow large Size again #95456

Merged
merged 1 commit into from
Mar 31, 2022
Merged

allow large Size again #95456

merged 1 commit into from
Mar 31, 2022

Conversation

RalfJung
Copy link
Member

This basically reverts most of #80042, and instead does the panic in bits() with a #[cold] function to make sure it does not get inlined.

#80042 added a comment about an invariant ("The top 3 bits are ALWAYS zero") that is not actually enforced, and if it were enforced that would be a problem for #95388. So I think we should not have that invariant, and I adjusted the code accordingly.

r? @oli-obk Cc @sivadeilra

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 30, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 30, 2022
@RalfJung
Copy link
Member Author

I think this should be perf-neutral but let's see.
@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 30, 2022
@bors
Copy link
Contributor

bors commented Mar 30, 2022

⌛ Trying commit 2799885 with merge db69c0f1fa2b71d1412a833d4b3c189e1520d38d...

@bors
Copy link
Contributor

bors commented Mar 30, 2022

☀️ Try build successful - checks-actions
Build commit: db69c0f1fa2b71d1412a833d4b3c189e1520d38d (db69c0f1fa2b71d1412a833d4b3c189e1520d38d)

@rust-timer
Copy link
Collaborator

Queued db69c0f1fa2b71d1412a833d4b3c189e1520d38d with parent 9c06e1b, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (db69c0f1fa2b71d1412a833d4b3c189e1520d38d): comparison url.

Summary: This benchmark run did not return any relevant results. 5 results were found to be statistically significant but too small to be relevant.

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

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR led to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 30, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Mar 30, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Mar 30, 2022

📌 Commit 2799885 has been approved by oli-obk

@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 Mar 30, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 30, 2022
allow large Size again

This basically reverts most of rust-lang#80042, and instead does the panic in `bits()` with a `#[cold]` function to make sure it does not get inlined.

rust-lang#80042 added a comment about an invariant ("The top 3 bits are ALWAYS zero") that is not actually enforced, and if it were enforced that would be a problem for rust-lang#95388. So I think we should not have that invariant, and I adjusted the code accordingly.

r? `@oli-obk` Cc `@sivadeilra`
@bors
Copy link
Contributor

bors commented Mar 31, 2022

⌛ Testing commit 2799885 with merge df20355...

@bors
Copy link
Contributor

bors commented Mar 31, 2022

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing df20355 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 31, 2022
@bors bors merged commit df20355 into rust-lang:master Mar 31, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 31, 2022
@RalfJung RalfJung deleted the size branch March 31, 2022 13:26
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (df20355): comparison url.

Summary: This benchmark run did not return any relevant results.

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

@rustbot label: -perf-regression

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.

6 participants