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

update Miri #108500

Merged
merged 77 commits into from
Feb 27, 2023
Merged

update Miri #108500

merged 77 commits into from
Feb 27, 2023

Conversation

RalfJung
Copy link
Member

r? @ghost

RalfJung and others added 30 commits January 13, 2023 11:45
add scfix test

I'm not sure if we currently *guarantee* to pass this test, but at least I was unable to get it to fail.

Cc `@cbeuw`
It was broken, and the fixed version actually fails...
remove scfix test

It was broken, and the fixed version actually fails...

Thanks `@cbeuw` !
Co-authored-by: Ralf Jung <post@ralfj.de>
Explain how to make josh authenticate with github via ssh

Without this I was unable to push, even though pushing directly to https without josh works.
bors and others added 13 commits February 21, 2023 12:36
This shim is required for `core::hint::spin_loop` on `arm` targets
This makes sure that the interface of `miri_host_to_target_path` is compatible with `CStr` for targets where `c_char` is unsigned (such as ARM). This commit changes the signature of `miri_host_to_target_path` in the README and in all test cases.
Specifically `aarch64-unknown-linux-gnu` and `arm-unknown-linux-gnueabi`
Co-authored-by: Ralf Jung <post@ralfj.de>
cargo-miri: bump `rustc_tools_util` crate

This dedupes crate versions in rust repo.
Get Miri working on ARM

- Add a shim for `llvm.arm.hint`, which is required by `core::hint::spin_loop` on `arm` targets. The shim simply calls `yield_active_thread` on a YIELD hint, just like the shim for `llvm.aarch64.isb` that's already present.
- Change the signature of `miri_host_to_target_path` to use `c_char` instead of `i8`, to make it compatible with `CStr` on targets where `c_char` is unsigned. The implementation of `miri_host_to_target_path` accesses the memory as bytes and does not need to be adjusted.
- Enable ARM targets in CI. Specifically, `aarch64-unknown-linux-gnu` and `arm-unknown-linux-gnueabi` on the Linux host.

Since all tests also pass for `aarch64-unknown-linux-gnu` I took the liberty of adding that target to CI as well.

Fixes rust-lang#2791
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 26, 2023
@rustbot
Copy link
Collaborator

rustbot commented Feb 26, 2023

The Miri subtree was changed

cc @rust-lang/miri

@rustbot
Copy link
Collaborator

rustbot commented Feb 26, 2023

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Feb 26, 2023

📌 Commit 3f88f4c has been approved by RalfJung

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 Feb 26, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 26, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 27, 2023
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#108319 (Don't project specializable RPITIT projection)
 - rust-lang#108364 (Unify validity checks into a single query)
 - rust-lang#108463 (bootstrap: Update the output of the `check` descriptions)
 - rust-lang#108477 (Make `match` arm comma suggestion more clear)
 - rust-lang#108486 (Merge diagnostic_items duplicate diagnostics)
 - rust-lang#108494 (Clean up JS files code a bit)
 - rust-lang#108500 (update Miri)
 - rust-lang#108502 (Don't trigger error for ReError when other region is empty.)
 - rust-lang#108513 (Remove `@nagisa` from review rotation)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 37338b8 into rust-lang:master Feb 27, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 27, 2023
@RalfJung RalfJung deleted the miri branch February 28, 2023 08:59
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants