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

remove some provenance-related machine hooks that Miri no longer needs #99644

Merged
merged 2 commits into from
Jul 24, 2022

Conversation

RalfJung
Copy link
Member

Then we can make scalar_to_ptr a method on Scalar. :)

Fixes rust-lang/miri#2188
r? @oli-obk

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 23, 2022
@rustbot
Copy link
Collaborator

rustbot commented Jul 23, 2022

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 23, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Jul 24, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jul 24, 2022

📌 Commit 4e89a7c 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 Jul 24, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 24, 2022
Rollup of 4 pull requests

Successful merges:

 - rust-lang#99644 (remove some provenance-related machine hooks that Miri no longer needs)
 - rust-lang#99657 (Docs - remove unnecessary `mut` that gives a warning)
 - rust-lang#99672 (Remove Clean trait implementation for more items)
 - rust-lang#99678 (Update doc comments that refer to config parameter)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 890cd7a into rust-lang:master Jul 24, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 24, 2022
@RalfJung RalfJung deleted the interpret-int-ptr-transmute branch July 25, 2022 12:35
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 4, 2022
allow numbers with provenance within CTFE execution

This effectively reverts rust-lang#97684 for CTFE.

Undoes the diagnostic changes that are tracked in rust-lang#99923, only for beta.
(On master this patch wouldn't apply any more, `enforce_number_no_provenance` is gone with rust-lang#99644 since the interpreter engine is not supposed to ever have provenance on integers.)

The test changes are an exact un-do of rust-lang#97684. However there is still some risk here since this exact code is not what has been battle-tested.

r? `@Mark-Simulacrum`
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.

Deprecate -Zmiri-allow-ptr-int-transmute?
5 participants