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

Adjust for supporting more implicit ptr-to-int transmutation #2516

Merged
merged 2 commits into from
Aug 31, 2022

Conversation

RalfJung
Copy link
Member

This is the Miri side of rust-lang/rust#101101.
Fixes #2456.

@RalfJung RalfJung force-pushed the read-pointer-as-bytes branch from 50d3ea5 to 8952a08 Compare August 27, 2022 21:53
src/machine.rs Outdated Show resolved Hide resolved
@RalfJung RalfJung force-pushed the read-pointer-as-bytes branch 2 times, most recently from 6a45b33 to c7c9f9b Compare August 31, 2022 10:07
@RalfJung
Copy link
Member Author

Hm, some test is taking forever and ui_test doesn't have any kind of timeout...

@RalfJung RalfJung force-pushed the read-pointer-as-bytes branch from c7c9f9b to d936f3a Compare August 31, 2022 10:56
@RalfJung
Copy link
Member Author

It's the pass/vec.rs test but I don't know why it times out.

Let's see if a slightly older rustc still works.
@bors r+

@bors
Copy link
Contributor

bors commented Aug 31, 2022

📌 Commit d936f3a has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Aug 31, 2022

⌛ Testing commit d936f3a with merge 872bea4...

bors added a commit that referenced this pull request Aug 31, 2022
Adjust for supporting more implicit ptr-to-int transmutation

This is the Miri side of rust-lang/rust#101101.
Fixes #2456.
@RalfJung
Copy link
Member Author

Yeah this times out still...
@bors r- retry

@RalfJung
Copy link
Member Author

Blocked on rust-lang/rust#101237.

@RalfJung RalfJung force-pushed the read-pointer-as-bytes branch 3 times, most recently from 1ba794f to 4383da8 Compare August 31, 2022 15:48
@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Aug 31, 2022

📌 Commit 4383da8 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Aug 31, 2022

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout read-pointer-as-bytes (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self read-pointer-as-bytes --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing tests/pass/transmute_fat.rs
Auto-merging tests/fail/validity/uninit_raw_ptr.stderr
Auto-merging tests/fail/validity/uninit_integer.stderr
Auto-merging tests/fail/validity/uninit_float.stderr
CONFLICT (modify/delete): tests/fail/validity/ptr_integer_array_transmute.stderr deleted in heads/homu-tmp and modified in HEAD. Version HEAD of tests/fail/validity/ptr_integer_array_transmute.stderr left in tree.
Removing tests/fail/validity/ptr_integer_array_transmute.rs
Auto-merging tests/fail/validity/invalid_fnptr_uninit.stderr
Auto-merging tests/fail/validity/invalid_char_uninit.stderr
Auto-merging tests/fail/validity/invalid_bool_uninit.stderr
CONFLICT (modify/delete): tests/fail/transmute_fat1.stderr deleted in heads/homu-tmp and modified in HEAD. Version HEAD of tests/fail/transmute_fat1.stderr left in tree.
Removing tests/fail/transmute_fat1.rs
Auto-merging tests/fail/reading_half_a_pointer.stderr
CONFLICT (content): Merge conflict in tests/fail/reading_half_a_pointer.stderr
Auto-merging tests/fail/intrinsics/raw_eq_on_ptr.stderr
CONFLICT (content): Merge conflict in tests/fail/intrinsics/raw_eq_on_ptr.stderr
Auto-merging src/machine.rs
Auto-merging src/diagnostics.rs
Automatic merge failed; fix conflicts and then commit the result.

@RalfJung RalfJung force-pushed the read-pointer-as-bytes branch from 4383da8 to 0113f9e Compare August 31, 2022 16:19
@RalfJung
Copy link
Member Author

Some of the changes here are due to rust-lang/rust#98919, but the conflicts made it too annoying to keep them in a separate commit...

@bors r+

@bors
Copy link
Contributor

bors commented Aug 31, 2022

📌 Commit 0113f9e has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Aug 31, 2022

⌛ Testing commit 0113f9e with merge 0da5f76...

@bors
Copy link
Contributor

bors commented Aug 31, 2022

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 0da5f76 to master...

@bors bors merged commit 0da5f76 into rust-lang:master Aug 31, 2022
@RalfJung RalfJung deleted the read-pointer-as-bytes branch September 1, 2022 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Miri errors when transmuting part of a pointer to an integer
3 participants