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

Miri subtree update #125005

Merged
merged 39 commits into from
May 11, 2024
Merged

Miri subtree update #125005

merged 39 commits into from
May 11, 2024

Conversation

RalfJung
Copy link
Member

r? @ghost

RalfJung and others added 30 commits May 5, 2024 18:49
unix/fs: a bit of cleanup around host-specific code
the actual target-specific things we want to test are all in getrandom,
and rand already tests miri itself
also add some comments for why we keep certain old obscure APIs supported
reduce test_dependencies

Also add comments for why we need all these 3 random functions for Windows, and the old Linux syscall interface.
avoid code duplication between realloc and malloc
organize libc tests into a proper folder, and run some of them on Windows
README: update introduction

For some time now, we have (to my knowledge) been able to detect all the UB that rustc actually exploits. I think it's time to advertise that.

We also haven't had the problem of "not every nightly has Miri" for a while.

`@rust-lang/miri` what do you think?
io::Error handling: keep around the full io::Error for longer so we can give better errors

This should help with the error message in rust-lang/miri#3587.
…RalfJung

Implement non-null pointer for malloc(0)

Use non-null pointer for malloc(0) as mentioned in  rust-lang#3576 to detect leaks and double free of ``malloc(0)`` addresses.
Allow test targets to be set via CLI args

Fixes rust-lang#3584

I'm not a pro shell script reader as I am a Windows user, but we shall see if the CI script broke.
make MIRI_TEST_TARGET and RUSTC_BLESS entirely an internal thing

They are just used to communicate between `./miri test`/`./x.py test miri` and the test harness, but should not be used by users.
bors and others added 9 commits May 9, 2024 10:30
rename 'extern-so' to 'native-lib'

Calling "extern" functions is not super clear IMO (extern to what), but saying that we are calling "native" functions from inside the interpreter makes it very clear I think.
alloc: update comments around malloc() alignment

Also separate the C heap shims form the Windows heap shims; their guarantees aren't quite the same.
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 11, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 11, 2024

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented May 11, 2024

📌 Commit 79a85d4 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 May 11, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request May 11, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#124928 (Stabilize `byte_slice_trim_ascii` for `&[u8]`/`&str`)
 - rust-lang#124954 (Document proper usage of `fmt::Error` and `fmt()`'s `Result`.)
 - rust-lang#124969 (check if `x test tests` missing any test directory)
 - rust-lang#124978 (Handle Deref expressions in invalid_reference_casting)
 - rust-lang#125005 (Miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8f03405 into rust-lang:master May 11, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 11, 2024
Rollup merge of rust-lang#125005 - RalfJung:miri-sync, r=RalfJung

Miri subtree update

r? `@ghost`
@rustbot rustbot added this to the 1.80.0 milestone May 11, 2024
@RalfJung RalfJung deleted the miri-sync branch May 11, 2024 14: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.

7 participants