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 #131036

Merged
merged 43 commits into from
Sep 30, 2024
Merged

Miri subtree update #131036

merged 43 commits into from
Sep 30, 2024

Conversation

RalfJung
Copy link
Member

r? @ghost

RalfJung and others added 30 commits September 23, 2024 11:47
add test for new abort_unwind function

Seems like a good thing to have an explicit test for.

Cc rust-lang#130338
looks like we need more permissions

The cron job [failed](https://github.com/rust-lang/miri/actions/runs/11007186322/job/30563264024) last night, so let's see if this helps.
Scope CI permissions to the job that needs it

I scoped the permissions only to the job that requires them.
…of 'align' for heap allocator coverage, move 'hello' to UNIX

HashMap now needs pretty target-specific randomness functions.
It still works on Android, but not on FreeBSD and Solarish.
Android: Fixed tests for libc time API

Closes rust-lang#3888.

There's nothing to do, really. All of the API is already supported by `miri`, but I just tweaked tests a bit to match the data structures and functions from `bionic`.
switch custom target JSON test to a less exotic target

We used to test an AVR target here, but while it is nice to test a 16bit target, it is also currently the case that rustc CI does not even check that libcore builds on a 16bit target -- and we don't want Miri to be in the game of maintaining that support. (See rust-lang#130818.)

So let's use a tier 2 target as the basis for testing a custom JSON target.

(FWIW, we also test wasm32-wasip2 which is tier 3, but I expect it will become tier 2 Soon-ish.)
bump rustc-build-sysroot version

This removes an implicit `--cap-lints` in the sysroot build. Let's see if that causes any trouble for the targets we test.
bors and others added 12 commits September 27, 2024 17:58
Update cc to 1.1.22

This version of `cc` contains a fix to prevent spurious rebuilds. Hopefully this should help avoid the CI issues rustc has been having.
add tests for validity of Box with custom allocator

Ensure that the validity visitor visits both parts of a box with custom allocator using the right types.
…fJung

implements arc4random_buf shim for freebsd/solarish platforms.

close rust-lang#3914
skip old getrandom crate on Solaris

Fixes rust-lang/miri#3924

Now we should be able to enable randomness tests on Solarish (and Android, while we are at it).
bump few deps

Bumps few things around `miri-script` reducing deps; bump `chrono-tz`.
let rustfmt format imports

This matches the recent change in rustc.

`@rust-lang/miri` what do you think?
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 29, 2024
@rustbot
Copy link
Collaborator

rustbot commented Sep 29, 2024

The Miri subtree was changed

cc @rust-lang/miri

@rustbot
Copy link
Collaborator

rustbot commented Sep 29, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Sep 29, 2024

📌 Commit 8c0adc6 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 Sep 29, 2024
@bors
Copy link
Contributor

bors commented Sep 30, 2024

⌛ Testing commit 8c0adc6 with merge e9df22f...

@bors
Copy link
Contributor

bors commented Sep 30, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 30, 2024
@bors bors merged commit e9df22f into rust-lang:master Sep 30, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 30, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e9df22f): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.8% [1.6%, 2.1%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 1.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.0% [1.0%, 1.0%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.0% [1.0%, 1.0%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 768.577s -> 769.779s (0.16%)
Artifact size: 341.42 MiB -> 341.41 MiB (-0.00%)

@RalfJung RalfJung deleted the miri-sync branch September 30, 2024 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

9 participants