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.

Sign up for GitHub

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

Jump to bottom

miri: avoid cloning AllocExtra #131593

Merged
merged 1 commit into from
Oct 14, 2024
Merged

miri: avoid cloning AllocExtra #131593

merged 1 commit into from
Oct 14, 2024

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Oct 12, 2024 •
edited
Loading

We shouldn't be cloning Miri allocations, so make AllocExtra::clone panic instead, and adjust the one case where we do clone (the leak check) to avoid cloning.

This is in preparation for rust-lang/miri#3966 where I am adding something to AllocExtra that cannot (easily) be cloned.

r? @saethlin

@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 Oct 12, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 12, 2024

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

@RalfJung RalfJung mentioned this pull request Oct 12, 2024
Merged
@saethlin
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 13, 2024

📌 Commit bc4366b has been approved by saethlin

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 Oct 13, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 13, 2024
@matthiaskrgr
Rollup merge of rust-lang#131593 - RalfJung:alloc-no-clone, r=saethlin
03a5943 
miri: avoid cloning AllocExtra

We shouldn't be cloning Miri allocations, so make `AllocExtra::clone` panic instead, and adjust the one case where we *do* clone (the leak check) to avoid cloning.

This is in preparation for rust-lang/miri#3966 where I am adding something to `AllocExtra` that cannot (easily) be cloned.

r? `@saethlin`
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 13, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2024
@bors
Auto merge of rust-lang#131665 - matthiaskrgr:rollup-i5hluna, r=matth…
dbec5c4 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128967 (std::fs::get_path freebsd update.)
 - rust-lang#129794 (uefi: Implement getcwd and chdir)
 - rust-lang#130629 (core/net: add Ipv[46]Addr::from_octets, Ipv6Addr::from_segments.)
 - rust-lang#131274 (library: Const-stabilize `MaybeUninit::assume_init_mut`)
 - rust-lang#131473 (compiler: `{TyAnd,}Layout` comes home)
 - rust-lang#131533 (emscripten: Use the latest emsdk 3.1.68)
 - rust-lang#131593 (miri: avoid cloning AllocExtra)
 - rust-lang#131616 (merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 14, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2024
@bors
Auto merge of rust-lang#131672 - matthiaskrgr:rollup-gyzysj4, r=matth…
5a50ebf 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128967 (std::fs::get_path freebsd update.)
 - rust-lang#130629 (core/net: add Ipv[46]Addr::from_octets, Ipv6Addr::from_segments.)
 - rust-lang#131274 (library: Const-stabilize `MaybeUninit::assume_init_mut`)
 - rust-lang#131473 (compiler: `{TyAnd,}Layout` comes home)
 - rust-lang#131533 (emscripten: Use the latest emsdk 3.1.68)
 - rust-lang#131593 (miri: avoid cloning AllocExtra)
 - rust-lang#131616 (merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate)
 - rust-lang#131660 (Also use outermost const-anon for impl items in `non_local_defs` lint)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2024
@bors
Auto merge of rust-lang#131672 - matthiaskrgr:rollup-gyzysj4, r=matth…
bcbbea8 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128967 (std::fs::get_path freebsd update.)
 - rust-lang#130629 (core/net: add Ipv[46]Addr::from_octets, Ipv6Addr::from_segments.)
 - rust-lang#131274 (library: Const-stabilize `MaybeUninit::assume_init_mut`)
 - rust-lang#131473 (compiler: `{TyAnd,}Layout` comes home)
 - rust-lang#131533 (emscripten: Use the latest emsdk 3.1.68)
 - rust-lang#131593 (miri: avoid cloning AllocExtra)
 - rust-lang#131616 (merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate)
 - rust-lang#131660 (Also use outermost const-anon for impl items in `non_local_defs` lint)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2024
@bors
Auto merge of rust-lang#131672 - matthiaskrgr:rollup-gyzysj4, r=matth…
17a19e6 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128967 (std::fs::get_path freebsd update.)
 - rust-lang#130629 (core/net: add Ipv[46]Addr::from_octets, Ipv6Addr::from_segments.)
 - rust-lang#131274 (library: Const-stabilize `MaybeUninit::assume_init_mut`)
 - rust-lang#131473 (compiler: `{TyAnd,}Layout` comes home)
 - rust-lang#131533 (emscripten: Use the latest emsdk 3.1.68)
 - rust-lang#131593 (miri: avoid cloning AllocExtra)
 - rust-lang#131616 (merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate)
 - rust-lang#131660 (Also use outermost const-anon for impl items in `non_local_defs` lint)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4139018 into rust-lang:master Oct 14, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 14, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2024
@rust-timer
Unrolled build for rust-lang#131593
b614d67 
Rollup merge of rust-lang#131593 - RalfJung:alloc-no-clone, r=saethlin

miri: avoid cloning AllocExtra

We shouldn't be cloning Miri allocations, so make `AllocExtra::clone` panic instead, and adjust the one case where we *do* clone (the leak check) to avoid cloning.

This is in preparation for rust-lang/miri#3966 where I am adding something to `AllocExtra` that cannot (easily) be cloned.

r? ``@saethlin``
@RalfJung RalfJung deleted the alloc-no-clone branch October 14, 2024 15:04
bors added a commit to rust-lang/miri that referenced this pull request Oct 14, 2024
@bors
Auto merge of #3966 - RalfJung:dont-trust-the-user, r=RalfJung
1362c5f 
Do not store synchronization primitive IDs in adressable memory

We shouldn't store this in a place where the program can mess with it.

Fixes #1649

Blocked by rust-lang/rust#131593
RalfJung pushed a commit to RalfJung/rust that referenced this pull request Oct 15, 2024
@bors
Auto merge of rust-lang#3966 - RalfJung:dont-trust-the-user, r=RalfJung
d183660 
Do not store synchronization primitive IDs in adressable memory

We shouldn't store this in a place where the program can mess with it.

Fixes rust-lang/miri#1649

Blocked by rust-lang#131593
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@saethlin saethlin

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
Milestone
1.84.0
Development

Successfully merging this pull request may close these issues.
4 participants
@RalfJung @rustbot @saethlin @bors