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

interpret: pass MemoryKind to adjust_alloc_base_pointer #124030

Merged
merged 2 commits into from
Apr 17, 2024

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Apr 16, 2024

Another puzzle piece for rust-lang/miri#3475.

The 2nd commit renames base_pointer -> root_pointer; that's how Tree Borrows already calls them and I think the term is more clear than "base pointer". In particular, this distinguishes it from "base address", since a root pointer can point anywhere into an allocation, not just its base address.

#124018 has been rolled up already so I couldn't add it there any more.

r? @oli-obk

@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 Apr 16, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 16, 2024

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

The Miri subtree was changed

cc @rust-lang/miri

fn addr_from_alloc_id(
&self,
alloc_id: AllocId,
_kind: MemoryKind<MiriMemoryKind>,
Copy link
Member Author

Choose a reason for hiding this comment

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

The kind isn't used yet here, but the plan is to use it in the future (to avoid reusing addresses of stack allocations).

@RalfJung RalfJung force-pushed the adjust_alloc_base_pointer branch 3 times, most recently from e729172 to 297f7e2 Compare April 16, 2024 20:14
@oli-obk
Copy link
Contributor

oli-obk commented Apr 17, 2024

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 17, 2024

📌 Commit ae7b07f has been approved by oli-obk

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 Apr 17, 2024
RalfJung added a commit to RalfJung/rust that referenced this pull request Apr 17, 2024
…, r=oli-obk

interpret: pass MemoryKind to adjust_alloc_base_pointer

Another puzzle piece for rust-lang/miri#3475.

The 2nd commit renames base_pointer -> root_pointer; that's how Tree Borrows already calls them and I think the term is more clear than "base pointer". In particular, this distinguishes it from "base address", since a root pointer can point anywhere into an allocation, not just its base address.

rust-lang#124018 has been rolled up already so I couldn't add it there any more.

r? `@oli-obk`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Apr 17, 2024
…, r=oli-obk

interpret: pass MemoryKind to adjust_alloc_base_pointer

Another puzzle piece for rust-lang/miri#3475.

The 2nd commit renames base_pointer -> root_pointer; that's how Tree Borrows already calls them and I think the term is more clear than "base pointer". In particular, this distinguishes it from "base address", since a root pointer can point anywhere into an allocation, not just its base address.

rust-lang#124018 has been rolled up already so I couldn't add it there any more.

r? ``@oli-obk``
RalfJung added a commit to RalfJung/rust that referenced this pull request Apr 17, 2024
…, r=oli-obk

interpret: pass MemoryKind to adjust_alloc_base_pointer

Another puzzle piece for rust-lang/miri#3475.

The 2nd commit renames base_pointer -> root_pointer; that's how Tree Borrows already calls them and I think the term is more clear than "base pointer". In particular, this distinguishes it from "base address", since a root pointer can point anywhere into an allocation, not just its base address.

rust-lang#124018 has been rolled up already so I couldn't add it there any more.

r? ``@oli-obk``
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 17, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#116957 (meta: notify #t-rustdoc Zulip stream on backport nominations)
 - rust-lang#122201 (Document overrides of `clone_from()` in core/std)
 - rust-lang#122723 (Use same file permissions for ar_archive_writer as the LLVM archive writer)
 - rust-lang#124030 (interpret: pass MemoryKind to adjust_alloc_base_pointer)
 - rust-lang#124037 (Don't ascend into parent bodies when collecting stmts for possible return suggestion)
 - rust-lang#124049 (Stabilize `const_io_structs`)
 - rust-lang#124062 (Add another expression to weird-exprs.rs)
 - rust-lang#124066 (Don't error on subtyping of equal types)
 - rust-lang#124073 (Remove libc from rust_get_test_int uses)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6388167 into rust-lang:master Apr 17, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 17, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 17, 2024
Rollup merge of rust-lang#124030 - RalfJung:adjust_alloc_base_pointer, r=oli-obk

interpret: pass MemoryKind to adjust_alloc_base_pointer

Another puzzle piece for rust-lang/miri#3475.

The 2nd commit renames base_pointer -> root_pointer; that's how Tree Borrows already calls them and I think the term is more clear than "base pointer". In particular, this distinguishes it from "base address", since a root pointer can point anywhere into an allocation, not just its base address.

rust-lang#124018 has been rolled up already so I couldn't add it there any more.

r? ```@oli-obk```
@RalfJung RalfJung deleted the adjust_alloc_base_pointer branch April 17, 2024 21:18
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
Development

Successfully merging this pull request may close these issues.

4 participants