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

StorageLive: refresh storage (instead of UB) when local is already live #126154

Merged
merged 2 commits into from
Jun 19, 2024

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jun 8, 2024

Blocked on this FCP, which also contains the motivation.

Fixes #99160
Fixes #98896 (by declaring it not-a-bug)
Fixes #119366
Fixes rust-lang/unsafe-code-guidelines#129

@rustbot
Copy link
Collaborator

rustbot commented Jun 8, 2024

r? @nnethercote

rustbot has assigned @nnethercote.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Jun 8, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 8, 2024

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

This PR changes MIR

cc @oli-obk, @RalfJung, @JakobDegen, @davidtwco, @celinval, @vakaras

@rust-log-analyzer

This comment has been minimized.

Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compiler-wise this looks fine to me. Marking as blocked though.

@compiler-errors
Copy link
Member

@rustbot blocked

@rustbot rustbot added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 8, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 14, 2024

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung
Copy link
Member Author

Compiler-wise this looks fine to me. Marking as blocked though.

FCP passed.

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Jun 18, 2024

📌 Commit 408c8eb has been approved by compiler-errors

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-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jun 18, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
…errors

StorageLive: refresh storage (instead of UB) when local is already live

Blocked on [this FCP](rust-lang#99160 (comment)), which also contains the motivation.

Fixes rust-lang#99160
Fixes rust-lang#98896 (by declaring it not-a-bug)
Fixes rust-lang#119366
Fixes rust-lang/unsafe-code-guidelines#129
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2024
Rollup of 6 pull requests

Successful merges:

 - rust-lang#125447 (Allow constraining opaque types during subtyping in the trait system)
 - rust-lang#125766 (MCDC Coverage: instrument last boolean RHS operands from condition coverage)
 - rust-lang#125880 (Remove `src/tools/rust-demangler`)
 - rust-lang#126154 (StorageLive: refresh storage (instead of UB) when local is already live)
 - rust-lang#126572 (override user defined channel when using precompiled rustc)
 - rust-lang#126662 (Unconditionally warn on usage of `wasm32-wasi`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 035285b into rust-lang:master Jun 19, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 19, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2024
Rollup merge of rust-lang#126154 - RalfJung:storage-live, r=compiler-errors

StorageLive: refresh storage (instead of UB) when local is already live

Blocked on [this FCP](rust-lang#99160 (comment)), which also contains the motivation.

Fixes rust-lang#99160
Fixes rust-lang#98896 (by declaring it not-a-bug)
Fixes rust-lang#119366
Fixes rust-lang/unsafe-code-guidelines#129
@RalfJung RalfJung deleted the storage-live branch June 19, 2024 19:22
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Aug 7, 2024
829: Backport two soundness fixes to 1.79 r=pietroalbini a=Veykril

Backports:
- rust-lang/rust#127364
- rust-lang/rust#126154

Co-authored-by: DianQK <dianqk@dianqk.net>
Co-authored-by: Ralf Jung <post@ralfj.de>
Co-authored-by: Lukas Wirth <lukas.wirth@ferrous-systems.com>
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Aug 8, 2024
829: Backport two soundness fixes to 1.79 r=pietroalbini a=Veykril

Backports:
- rust-lang/rust#127364
- rust-lang/rust#126154

Co-authored-by: DianQK <dianqk@dianqk.net>
Co-authored-by: Ralf Jung <post@ralfj.de>
Co-authored-by: Lukas Wirth <lukas.wirth@ferrous-systems.com>
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Aug 13, 2024
838: Add tests for backports r=skade a=Veykril

- `tests/ui/ferrocene/llvm/no-segfault.rs` tests [issue#127260](rust-lang/rust#127260) which was fixed by the backported [PR#127364](rust-lang/rust#127364) 
- `tests/ui/ferrocene/consts/storage-live-on-live.rs` tests [issue#119366](rust-lang/rust#119366) which was fixed by the backported [PR#126154](rust-lang/rust#126154)
- `tests/codegen/ferrocene/miscompile_127286.rs` tests [issue#127286](rust-lang/rust#127286) which was fixed by the backported [PR#127364](rust-lang/rust#127364) 

Co-authored-by: Lukas Wirth <lukas.wirth@ferrous-systems.com>
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Aug 13, 2024
838: Add tests for backports r=skade a=Veykril

- `tests/ui/ferrocene/llvm/no-segfault.rs` tests [issue#127260](rust-lang/rust#127260) which was fixed by the backported [PR#127364](rust-lang/rust#127364) 
- `tests/ui/ferrocene/consts/storage-live-on-live.rs` tests [issue#119366](rust-lang/rust#119366) which was fixed by the backported [PR#126154](rust-lang/rust#126154)
- `tests/codegen/ferrocene/miscompile_127286.rs` tests [issue#127286](rust-lang/rust#127286) which was fixed by the backported [PR#127364](rust-lang/rust#127364) 

Co-authored-by: Lukas Wirth <lukas.wirth@ferrous-systems.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
6 participants