Thanks to visit codestin.com
Credit goes to github.com

Skip to content

update Miri #104456

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.

Sign up for GitHub

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

Merged
merged 27 commits into from
Nov 16, 2022
Merged

update Miri #104456

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
aaa2392
Merge from rustc
RalfJung Nov 5, 2022
42e450d
Auto merge of #2650 - RalfJung:rustup, r=RalfJung
bors Nov 5, 2022
4828edf
Auto merge of #2638 - DrMeepster:windows-condvars, r=RalfJung
bors Nov 6, 2022
46d0df4
remove a stray stderr file
RalfJung Nov 6, 2022
724c1a0
Auto merge of #2653 - RalfJung:stderr, r=RalfJung
bors Nov 6, 2022
943f88b
README: Add macos cache deletion command
mkroening Nov 6, 2022
57d06f7
Auto merge of #2654 - mkroening:macos-cache, r=RalfJung
bors Nov 6, 2022
1f0a672
bump rustc-build-sysroot
RalfJung Nov 6, 2022
9c574d8
Auto merge of #2655 - RalfJung:rustc-build-sysroot, r=RalfJung
bors Nov 6, 2022
2b39687
Add miri_alloc, miri_dealloc
mkroening Nov 7, 2022
de562ec
Bump ui test
oli-obk Nov 8, 2022
71c3ecf
Auto merge of #2659 - oli-obk:ui_test_bump, r=RalfJung
bors Nov 8, 2022
c02fa89
Merge from rustc
RalfJung Nov 10, 2022
9356627
Auto merge of #2662 - RalfJung:rustup, r=RalfJung
bors Nov 10, 2022
6adb2df
pthread: slight refactoring of how we access the sync object fields
RalfJung Nov 13, 2022
2e6676d
Auto merge of #2663 - RalfJung:sync, r=RalfJung
bors Nov 13, 2022
096c33f
final tweaks
RalfJung Nov 13, 2022
9ef0de9
Auto merge of #2657 - mkroening:miri-alloc, r=RalfJung
bors Nov 13, 2022
8d7f257
Merge from rustc
RalfJung Nov 15, 2022
c6649aa
Auto merge of #2665 - RalfJung:rustup, r=RalfJung
bors Nov 15, 2022
3c72492
update josh instructions
RalfJung Nov 15, 2022
a046f62
Auto merge of #2666 - RalfJung:josh, r=RalfJung
bors Nov 15, 2022
a47e431
adjust josh pushing and remove ./miri toolchain updating the toolchai…
RalfJung Nov 15, 2022
209bcbb
Auto merge of #2667 - RalfJung:josh, r=RalfJung
bors Nov 15, 2022
5516273
update lockfile
RalfJung Nov 15, 2022
6906f08
allow fastrand dependency
RalfJung Nov 16, 2022
157b2d5
ensure rand has its default features enabled
RalfJung Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/tools/miri/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,13 +283,13 @@ With this, you should now have a working development setup! See
## Advanced topic: Syncing with the rustc repo

We use the [`josh` proxy](https://github.com/josh-project/josh) to transmit
changes between the rustc and Miri repositories. For now, a fork of josh needs to be built
from source. This downloads and runs josh:
changes between the rustc and Miri repositories. For now, the latest git version
of josh needs to be built from source. This downloads and runs josh:

```sh
git clone https://github.com/RalfJung/josh
git clone https://github.com/josh-project/josh
cd josh
cargo run --release -p josh-proxy -- --local=$(pwd)/local --remote=https://github.com --no-background
cargo run --release -p josh-proxy -- --local=local --remote=https://github.com --no-background
```

### Importing changes from the rustc repo
Expand Down
4 changes: 2 additions & 2 deletions src/tools/miri/miri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ shift
# macOS does not have a useful readlink/realpath so we have to use Python instead...
MIRIDIR=$(python3 -c 'import os, sys; print(os.path.dirname(os.path.realpath(sys.argv[1])))' "$0")
# Used for rustc syncs.
JOSH_FILTER=":at_commit=75dd959a3a40eb5b4574f8d2e23aa6efbeb33573[:prefix=src/tools/miri]:/src/tools/miri"
JOSH_FILTER=":rev(75dd959a3a40eb5b4574f8d2e23aa6efbeb33573:prefix=src/tools/miri):/src/tools/miri"
# Needed for `./miri bench`.
TOOLCHAIN=$(cd "$MIRIDIR"; rustup show active-toolchain | head -n 1 | cut -d ' ' -f 1)

Expand Down Expand Up @@ -149,7 +149,7 @@ rustc-push)
# and set `-o base` to a branch that holds current rustc master.
echo "Preparing $USER/rust..."
if git fetch https://github.com/$USER/rust $BRANCH &>/dev/null; then
echo "The '$BRANCH' seems to already exist in $USER/rust. Please delete it and try again."
echo "The branch '$BRANCH' seems to already exist in $USER/rust. Please delete it and try again."
exit 1
fi
git fetch https://github.com/rust-lang/rust master
Expand Down