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

Revert unsound libcore changes #120562

Merged
merged 1 commit into from
Feb 4, 2024
Merged

Revert unsound libcore changes #120562

merged 1 commit into from
Feb 4, 2024

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Feb 1, 2024

fixes #120537

these were introduced in #119911

@rustbot
Copy link
Collaborator

rustbot commented Feb 1, 2024

r? @cuviper

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Feb 1, 2024
@Mark-Simulacrum
Copy link
Member

@bors treeclosed=100 CI is stalled again.

@NCGThompson
Copy link
Contributor

I don't think reverting the whole thing is necessary because the unsoundness can be fixed by just adding a - 1. However, if you do decide revert it, I'll take my time rewriting it, because there are some parts that could use more attention.

@cuviper
Copy link
Member

cuviper commented Feb 2, 2024

@NCGThompson do you plan to submit a fix PR? If so, feel free to tag me as the reviewer, and please do include more tests of the boundary conditions, both Some and None cases.

@oli-obk
Copy link
Contributor Author

oli-obk commented Feb 2, 2024

I'd like to land this PR first so we don't end up with it in beta. Afterwards reverting this PR again and applying a fix should not be much effort

@cuviper
Copy link
Member

cuviper commented Feb 2, 2024

Fair enough! I'm not sure what's going to happen with beta branching around the current tree closure, but can queue it up and also beta-backport if needed.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 2, 2024

📌 Commit 6ac035d has been approved by cuviper

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Feb 2, 2024

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Feb 2, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 4, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#119543 (add avx512fp16 to x86 target features)
 - rust-lang#120004 (Release notes for 1.76)
 - rust-lang#120562 (Revert unsound libcore changes)
 - rust-lang#120566 (coverage: Use normal `edition:` headers in coverage tests)
 - rust-lang#120570 (Suggest changing type to const parameters if we encounter a type in the trait bound position)
 - rust-lang#120571 (Miscellaneous diagnostics cleanups)
 - rust-lang#120573 (Remove `BorrowckErrors::tainted_by_errors`)
 - rust-lang#120592 (Remove unnecessary `.to_string()`/`.as_str()`s)
 - rust-lang#120610 (hir: Remove the generic type parameter from `MaybeOwned`)
 - rust-lang#120616 (Fix ICE on field access on a tainted type after const-eval failure)

Failed merges:

 - rust-lang#120569 (coverage: Improve handling of function/closure spans)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 4, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#119543 (add avx512fp16 to x86 target features)
 - rust-lang#120004 (Release notes for 1.76)
 - rust-lang#120562 (Revert unsound libcore changes)
 - rust-lang#120566 (coverage: Use normal `edition:` headers in coverage tests)
 - rust-lang#120570 (Suggest changing type to const parameters if we encounter a type in the trait bound position)
 - rust-lang#120571 (Miscellaneous diagnostics cleanups)
 - rust-lang#120573 (Remove `BorrowckErrors::tainted_by_errors`)
 - rust-lang#120592 (Remove unnecessary `.to_string()`/`.as_str()`s)
 - rust-lang#120610 (hir: Remove the generic type parameter from `MaybeOwned`)
 - rust-lang#120616 (Fix ICE on field access on a tainted type after const-eval failure)

Failed merges:

 - rust-lang#120569 (coverage: Improve handling of function/closure spans)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 977945d into rust-lang:master Feb 4, 2024
11 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Feb 4, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 4, 2024
Rollup merge of rust-lang#120562 - oli-obk:revert_stuff, r=cuviper

Revert unsound libcore changes

fixes rust-lang#120537

these were introduced in rust-lang#119911
@cuviper
Copy link
Member

cuviper commented Feb 4, 2024

#120537 is a regression in 1.77 that this fixes (by revert).

@rustbot label +beta-nominated

@rustbot rustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 4, 2024
@oli-obk oli-obk deleted the revert_stuff branch February 5, 2024 03:14
@oli-obk oli-obk added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 5, 2024
@oli-obk
Copy link
Contributor Author

oli-obk commented Feb 5, 2024

Unilaterally accepting for beta backport. This is a soundness fix after all, and just a revert, so danger-free

@cuviper cuviper mentioned this pull request Feb 14, 2024
@cuviper cuviper modified the milestones: 1.78.0, 1.77.0 Feb 14, 2024
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 14, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2024
[beta] backports

- Correct paths for hexagon-unknown-none-elf platform doc rust-lang#120533
- CI: Use ninja on apple builders rust-lang#120543
- Correctly check `never_type` feature gating rust-lang#120552
- Revert unsound libcore changes of 119911 rust-lang#120562

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2024
[beta] backports

- Correct paths for hexagon-unknown-none-elf platform doc rust-lang#120533
- CI: Use ninja on apple builders rust-lang#120543
- Correctly check `never_type` feature gating rust-lang#120552
- Revert unsound libcore changes of 119911 rust-lang#120562

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2024
[beta] backports

- Correct paths for hexagon-unknown-none-elf platform doc rust-lang#120533
- CI: Use ninja on apple builders rust-lang#120543
- Correctly check `never_type` feature gating rust-lang#120552
- Revert unsound libcore changes of 119911 rust-lang#120562
- Downgrade xcode rust-lang#120914

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 16, 2024
[beta] backports

- Correct paths for hexagon-unknown-none-elf platform doc rust-lang#120533
- CI: Use ninja on apple builders rust-lang#120543
- Correctly check `never_type` feature gating rust-lang#120552
- Revert unsound libcore changes of 119911 rust-lang#120562
- Downgrade xcode rust-lang#120914
- Update jobserver-rs to 0.1.28 rust-lang#120846
- [beta] Update LLVM submodule rust-lang#121132

r? cuviper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

miri: checked_pow: overflowing shift by 64 in unchecked_shl
6 participants