Skip to content

interpret: get_alloc_info: also return mutability - #132801

Merged
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:alloc-mutability
Nov 10, 2024
Merged

interpret: get_alloc_info: also return mutability#132801
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:alloc-mutability

Conversation

@RalfJung

@RalfJungRalfJung commented Nov 9, 2024

Copy link
Copy Markdown
Member

This will be needed for rust-lang/miri#3971

This then tuned into a larger refactor where we introduce a new type for the get_alloc_info return data, and we move some code to methods on GlobalAlloc to avoid duplicating it between the validity check and get_alloc_info.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @wesleywiser

rustbot has assigned @wesleywiser.
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

@rustbotrustbot 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 Nov 9, 2024
@rustbot

Copy link
Copy Markdown
Collaborator

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred to the CTFE machinery

cc @rust-lang/wg-const-eval

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

@oli-obk

Copy link
Copy Markdown
Contributor

It may be time to use a struct instead of a tuple 😀

@RalfJung

Copy link
Copy Markdown
MemberAuthor

Yeah...

@rust-log-analyzer

This comment has been minimized.

@rustbot

Copy link
Copy Markdown
Collaborator

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri, @rust-lang/wg-const-eval

Comment threadcompiler/rustc_middle/src/mir/interpret/mod.rs Outdated
@RalfJung
RalfJungforce-pushed the alloc-mutability branch 2 times, most recently from a30e9a6 to a816ccdCompareNovember 9, 2024 13:29
@rust-log-analyzer

This comment has been minimized.

@oli-obk

Copy link
Copy Markdown
Contributor

bors r plus

@bors

bors commented Nov 9, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 4a54ec8 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 Nov 9, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 9, 2024
interpret: get_alloc_info: also return mutability
This will be needed for rust-lang/miri#3971
This then tuned into a larger refactor where we introduce a new type for the `get_alloc_info` return data, and we move some code to methods on `GlobalAlloc` to avoid duplicating it between the validity check and `get_alloc_info`.
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 9, 2024
…iaskrgr
Rollup of 4 pull requests
Successful merges:
- rust-lang#131258 (Stabilize s390x inline assembly)
- rust-lang#132577 (Report the `unexpected_cfgs` lint in external macros)
- rust-lang#132801 (interpret: get_alloc_info: also return mutability)
- rust-lang#132825 (Exclude relnotes-tracking-issue from needs-triage)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 10, 2024
…kingjubilee
Rollup of 6 pull requests
Successful merges:
- rust-lang#131258 (Stabilize s390x inline assembly)
- rust-lang#132801 (interpret: get_alloc_info: also return mutability)
- rust-lang#132823 (require const_impl_trait gate for all conditional and trait const calls)
- rust-lang#132824 (Update grammar in wasm-c-abi's compiler flag documentation)
- rust-lang#132825 (Exclude relnotes-tracking-issue from needs-triage)
- rust-lang#132828 (Additional tests to ensure let is rejected during parsing)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 61f5193 into rust-lang:masterNov 10, 2024
@rustbotrustbot added this to the 1.84.0 milestone Nov 10, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 10, 2024
Rollup merge of rust-lang#132801 - RalfJung:alloc-mutability, r=oli-obk
interpret: get_alloc_info: also return mutability
This will be needed for rust-lang/miri#3971
This then tuned into a larger refactor where we introduce a new type for the `get_alloc_info` return data, and we move some code to methods on `GlobalAlloc` to avoid duplicating it between the validity check and `get_alloc_info`.
@RalfJung
RalfJung deleted the alloc-mutability branch November 10, 2024 09:00
mati865 pushed a commit to mati865/rust that referenced this pull request Nov 12, 2024
interpret: get_alloc_info: also return mutability
This will be needed for rust-lang/miri#3971
This then tuned into a larger refactor where we introduce a new type for the `get_alloc_info` return data, and we move some code to methods on `GlobalAlloc` to avoid duplicating it between the validity check and `get_alloc_info`.
mati865 pushed a commit to mati865/rust that referenced this pull request Nov 12, 2024
…kingjubilee
Rollup of 6 pull requests
Successful merges:
- rust-lang#131258 (Stabilize s390x inline assembly)
- rust-lang#132801 (interpret: get_alloc_info: also return mutability)
- rust-lang#132823 (require const_impl_trait gate for all conditional and trait const calls)
- rust-lang#132824 (Update grammar in wasm-c-abi's compiler flag documentation)
- rust-lang#132825 (Exclude relnotes-tracking-issue from needs-triage)
- rust-lang#132828 (Additional tests to ensure let is rejected during parsing)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

7 participants

@RalfJung@rustbot@oli-obk@rust-log-analyzer@bors@fbstj@wesleywiser