-
Notifications
You must be signed in to change notification settings - Fork 13.6k
miri subtree update #144570
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
Closed
Closed
miri subtree update #144570
Changes from all commits
Commits
Show all changes
46 commits
Select commit
Hold shift + click to select a range
8acdee7
don't halt execution when we write to a read-only file
RalfJung d3fc02c
non-deterministically truncate reads/writes
RalfJung 72ba7c5
Preparing for merge from rustc
e3e711b
Merge from rustc
9ef15d2
Merge pull request #4486 from rust-lang/rustup-2025-07-21
RalfJung 800d805
Merge pull request #4481 from RalfJung/read-write-truncate
oli-obk 6f06667
Preparing for merge from rustc
4d62686
Merge from rustc
7a8288b
Merge pull request #4487 from rust-lang/rustup-2025-07-22
oli-obk 08d7787
CI: add windows-arm runner
RalfJung a6c1093
Init josh-sync config file
Kobzol a61657e
Remove Josh code from `miri-script`
Kobzol 037b2f6
Merge pull request #4479 from RalfJung/ci-win-arm
RalfJung e685e90
Update `CONTRIBUTING.md`
Kobzol 48963fa
Update CI workflow
Kobzol 8664aa7
Remove Zulip API keys and use `set -x`
Kobzol cbd1557
Merge pull request #4490 from Kobzol/use-josh-sync
RalfJung fd114d4
make the missing-MIR message more clear
RalfJung 94f725f
Merge pull request #4491 from RalfJung/missing-mir
RalfJung 0258894
Prepare for merging from rust-lang/rust
8ff5894
Merge ref 'b56aaec52bc0' from rust-lang/rust
0dba9f5
fmt
60b0545
Fix cronjob Zulip message
Kobzol 80c9f78
Merge pull request #4493 from Kobzol/ci-fail-message
RalfJung 2a81b4f
Use i64 for tracing chrome "id"
Stypox 00de833
Fix missing $ in enter_trace_span!
Stypox c7b81f3
Fix double "fatal error: " in message
Stypox d2ba3c8
fix target json
RalfJung dd96ec6
Merge pull request #4492 from rust-lang/rustup-2025-07-25
RalfJung 5295649
Merge pull request #4489 from Stypox/misc-tracing-fixes
RalfJung d88bdc9
CI: run apt update before installing anything
RalfJung 4779dd7
Merge pull request #4494 from RalfJung/ci
RalfJung 23e2942
call_function helper: dont ICE on return type mismatches
RalfJung 43eaa4f
Merge pull request #4496 from RalfJung/ctor-ret-type
RalfJung fd65b7e
introduce a macro for shim signature checking
RalfJung b59c40e
Merge pull request #4497 from RalfJung/check-shim
RalfJung 4125905
Add support for building and linking against genmc
Patrick-6 87b8cb0
various minor adjustments
RalfJung c751579
Merge pull request #4498 from RalfJung/genmc-build
RalfJung a20692c
centralize clockid_t interpretation
RalfJung 0570fb4
Merge pull request #4499 from RalfJung/clockid
RalfJung fbd553e
prepare for sync
RalfJung 8bf3251
Merge commit 'abd9cba5acbcc35fb4cc59ce25580fa1624b5571'
RalfJung dea3e13
revert accidental change
RalfJung fb46410
Merge pull request #4500 from RalfJung/rustup
RalfJung d2ee320
update lockfile, bless tidy
RalfJung File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,11 +45,17 @@ jobs: | |
| os: macos-latest | ||
| - host_target: i686-pc-windows-msvc | ||
| os: windows-latest | ||
| - host_target: aarch64-pc-windows-msvc | ||
| os: windows-11-arm | ||
| runs-on: ${{ matrix.os }} | ||
| env: | ||
| HOST_TARGET: ${{ matrix.host_target }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: apt update | ||
| if: ${{ startsWith(matrix.os, 'ubuntu') }} | ||
| # The runners seem to have outdated apt repos sometimes | ||
| run: sudo apt update | ||
| - name: install qemu | ||
| if: ${{ matrix.qemu }} | ||
| run: sudo apt install qemu-user qemu-user-binfmt | ||
|
|
@@ -63,6 +69,12 @@ jobs: | |
| sudo apt update | ||
| # Install needed packages | ||
| sudo apt install $(echo "libatomic1: zlib1g-dev:" | sed 's/:/:${{ matrix.multiarch }}/g') | ||
| - name: Install rustup on Windows ARM | ||
| if: ${{ matrix.os == 'windows-11-arm' }} | ||
| run: | | ||
| curl -LOs https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe | ||
| ./rustup-init.exe -y --no-modify-path | ||
| echo "$USERPROFILE/.cargo/bin" >> "$GITHUB_PATH" | ||
| - uses: ./.github/workflows/setup | ||
| with: | ||
| toolchain_flags: "--host ${{ matrix.host_target }}" | ||
|
|
@@ -147,35 +159,48 @@ jobs: | |
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 256 # get a bit more of the history | ||
| - name: install josh-proxy | ||
| run: cargo +stable install josh-proxy --git https://github.com/josh-project/josh --tag r24.10.04 | ||
| - name: install josh-sync | ||
| run: cargo +stable install --locked --git https://github.com/rust-lang/josh-sync | ||
| - name: setup bot git name and email | ||
| run: | | ||
| git config --global user.name 'The Miri Cronjob Bot' | ||
| git config --global user.email '[email protected]' | ||
| - name: Install nightly toolchain | ||
| run: rustup toolchain install nightly --profile minimal | ||
| - name: get changes from rustc | ||
| run: ./miri rustc-pull | ||
| - name: Install rustup-toolchain-install-master | ||
| run: cargo install -f rustup-toolchain-install-master | ||
| - name: format changes (if any) | ||
| - name: Push changes to a branch and create PR | ||
| run: | | ||
| # Make it easier to see what happens. | ||
| set -x | ||
| # Temporarily disable early exit to examine the status code of rustc-josh-sync | ||
| set +e | ||
| rustc-josh-sync pull | ||
| exitcode=$? | ||
| set -e | ||
|
|
||
| # If there were no changes to pull, rustc-josh-sync returns status code 2. | ||
| # In that case, skip the rest of the job. | ||
| if [ $exitcode -eq 2 ]; then | ||
| echo "Nothing changed in rustc, skipping PR" | ||
| exit 0 | ||
| elif [ $exitcode -ne 0 ]; then | ||
| # If return code was not 0 or 2, rustc-josh-sync actually failed | ||
| echo "error: rustc-josh-sync failed" | ||
| exit ${exitcode} | ||
| fi | ||
|
|
||
| # Format changes | ||
| ./miri toolchain | ||
| ./miri fmt --check || (./miri fmt && git commit -am "fmt") | ||
| - name: Push changes to a branch and create PR | ||
| run: | | ||
| # `git diff --exit-code` "succeeds" if the diff is empty. | ||
| if git diff --exit-code HEAD^; then echo "Nothing changed in rustc, skipping PR"; exit 0; fi | ||
| # The diff is non-empty, create a PR. | ||
|
|
||
| # Create a PR | ||
| BRANCH="rustup-$(date -u +%Y-%m-%d)" | ||
| git switch -c $BRANCH | ||
| git push -u origin $BRANCH | ||
| gh pr create -B master --title 'Automatic Rustup' --body 'Please close and re-open this PR to trigger CI, then enable auto-merge.' | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| ZULIP_BOT_EMAIL: ${{ secrets.ZULIP_BOT_EMAIL }} | ||
| ZULIP_API_TOKEN: ${{ secrets.ZULIP_API_TOKEN }} | ||
|
|
||
| cron-fail-notify: | ||
| name: cronjob failure notification | ||
|
|
@@ -198,7 +223,7 @@ jobs: | |
| It would appear that the [Miri cron job build]('"https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"') failed. | ||
|
|
||
| This likely means that rustc changed the miri directory and | ||
| we now need to do a [`./miri rustc-pull`](https://github.com/rust-lang/miri/blob/master/CONTRIBUTING.md#importing-changes-from-the-rustc-repo). | ||
| we now need to do a [`rustc-josh-sync pull`](https://github.com/rust-lang/miri/blob/master/CONTRIBUTING.md#importing-changes-from-the-rustc-repo). | ||
|
|
||
| Would you mind investigating this issue? | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| target | ||
| /doc | ||
| tex/*/out | ||
| *.dot | ||
| *.out | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FWIW, we could just remove the pin here and rely on
rustc_llvmpinning the version for the entire workspace... 🤷