Skip to content

core: fix const ptr::swap_nonoverlapping when there are pointers at odd offsets - #134689

Merged
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:ptr-swap-test
Dec 24, 2024
Merged

core: fix const ptr::swap_nonoverlapping when there are pointers at odd offsets#134689
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:ptr-swap-test

Conversation

@RalfJung

@RalfJung RalfJung commented Dec 23, 2024

Copy link
Copy Markdown
Member

Ensure that the pointer gets swapped correctly even if it is not stored at an aligned offset. This rules out implementations that copy things in a usize loop -- so our implementation needs to be adjusted to avoid such a loop when running in const context.

Part of #133668

@rustbot

rustbot commented Dec 23, 2024

Copy link
Copy Markdown
Collaborator

r? @workingjubilee

rustbot has assigned @workingjubilee.
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-libs Relevant to the library team, which will review and decide on the PR/issue. labels Dec 23, 2024
@rustbot

rustbot commented Dec 23, 2024

Copy link
Copy Markdown
Collaborator

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

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

@rust-log-analyzer

This comment has been minimized.

@oli-obk oli-obk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

r=me with output blessed

@RalfJung

Copy link
Copy Markdown
Member Author

@bors r=oli-obk

@bors

bors commented Dec 23, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit af1c8da 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 Dec 23, 2024
@oli-obk oli-obk assigned oli-obk and unassigned workingjubilee Dec 23, 2024
@RalfJung

Copy link
Copy Markdown
Member Author

Somehow this does not show up in the queue?
@bors retry

@RalfJung RalfJung closed this Dec 23, 2024
@RalfJung RalfJung reopened this Dec 23, 2024
@RalfJung

Copy link
Copy Markdown
Member Author

@bors r=oli-obk

@bors

bors commented Dec 23, 2024

Copy link
Copy Markdown
Collaborator

💡 This pull request was already approved, no need to approve it again.

@bors

bors commented Dec 23, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit af1c8da has been approved by oli-obk

It is now in the queue for this repository.

@RalfJung

Copy link
Copy Markdown
Member Author

@bors rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 24, 2024
Rollup of 5 pull requests

Successful merges:

 - rust-lang#134638 (Fix effect predicates from item bounds in old solver)
 - rust-lang#134662 (Fix safety docs for `dyn Any + Send {+ Sync}`)
 - rust-lang#134689 (core: fix const ptr::swap_nonoverlapping when there are pointers at odd offsets)
 - rust-lang#134699 (Belay new reviews for workingjubilee)
 - rust-lang#134701 (Correctly note item kind in `NonConstFunctionCall` error message)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit bbd30b5 into rust-lang:master Dec 24, 2024
@rustbot rustbot added this to the 1.85.0 milestone Dec 24, 2024
@RalfJung
RalfJung deleted the ptr-swap-test branch December 24, 2024 07: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-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.

6 participants