Skip to content

Miri subtree update #124368

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

Merged
merged 48 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
465dcf1
global allocations: don't make up a super-high VectorIdx, just use th…
RalfJung Apr 20, 2024
b562faa
more consistently talk about the 'active thread', not the 'current th…
RalfJung Apr 20, 2024
bc1538d
Auto merge of #3496 - RalfJung:thread-vector-idx, r=RalfJung
bors Apr 20, 2024
9b9c548
Add `-Zmiri-env-set` to set environment variables without modifying t…
eduardosm Apr 19, 2024
fde24ed
Add localtime_r shim
tiif Apr 22, 2024
2ca5524
Auto merge of #3461 - tiif:add_localtime_r_shim, r=RalfJung
bors Apr 22, 2024
fb2396c
Preparing for merge from rustc
Apr 23, 2024
cc1bf5e
Merge from rustc
Apr 23, 2024
9120dc2
Auto merge of #3500 - rust-lang:rustup-2024-04-23, r=RalfJung
bors Apr 23, 2024
4bcd5af
Missing word at the end of sentence
oli-obk Apr 23, 2024
3b5d663
Auto merge of #3493 - eduardosm:env-set, r=oli-obk
bors Apr 23, 2024
15a1b0d
chore: fix some typos in comments
forcedebug Apr 23, 2024
ed36dde
add Windows TLS bug to trophy case
RalfJung Apr 23, 2024
579940c
Auto merge of #3503 - RalfJung:win-tls, r=RalfJung
bors Apr 23, 2024
26faaa3
Auto merge of #3504 - forcedebug:master, r=RalfJung
bors Apr 23, 2024
5d1654a
CI: don't run cron-fail-notify when the job just got canceled
RalfJung Apr 23, 2024
799a4de
Implement LLVM x86 AVX2 intrinsics
eduardosm Apr 19, 2024
ed15716
Configure clippy not to generate warnings about arithmetic operations…
eduardosm Apr 23, 2024
4dbc4f8
Fix wording in shift functions doc comments
eduardosm Apr 23, 2024
b3affd3
Preparing for merge from rustc
Apr 24, 2024
7e96835
Merge from rustc
Apr 24, 2024
a3fddf2
Auto merge of #3506 - rust-lang:rustup-2024-04-24, r=RalfJung
bors Apr 24, 2024
342943b
windows: basic support for GetUserProfileDirectoryW
RalfJung Apr 23, 2024
00acfab
windows buffer size protocol: turns out std resets last_error to 0; l…
RalfJung Apr 23, 2024
ccb43b6
make the obsucre truncating variant of this.write_os_str_to_wide_str …
RalfJung Apr 23, 2024
ccb87f1
avoid some unnecessary Scalar-i32-Scalar roundtrips
RalfJung Apr 23, 2024
6c34d46
Auto merge of #3502 - RalfJung:GetUserProfileDirectoryW, r=RalfJung
bors Apr 24, 2024
193b37d
avoid 'let _' in tests where we actually want the value to be computed
RalfJung Apr 24, 2024
bd6766f
Auto merge of #3507 - RalfJung:let-underscore, r=RalfJung
bors Apr 24, 2024
c1073fb
Auto merge of #3492 - eduardosm:intrinsics-x86-avx2, r=oli-obk
bors Apr 24, 2024
aa19679
unix_sigpipe: don't inline DEFAULT, just use it from rustc
RalfJung Apr 24, 2024
f3dfaa7
Auto merge of #3510 - RalfJung:sigpipe-default, r=RalfJung
bors Apr 24, 2024
8b0ab42
Upgrade to `actions/checkout@v4` in `ci.yml`.
obi1kenobi Apr 24, 2024
246ba3b
Auto merge of #3511 - obi1kenobi:patch-1, r=RalfJung
bors Apr 24, 2024
8c24fe1
make miri-script a workspace root
RalfJung Apr 24, 2024
bed7caf
Preparing for merge from rustc
Apr 25, 2024
ff6fc75
Merge from rustc
Apr 25, 2024
258e504
fmt
Apr 25, 2024
c69c79d
Auto merge of #3505 - RalfJung:ci, r=RalfJung
bors Apr 25, 2024
9d7a47f
Auto merge of #3513 - rust-lang:rustup-2024-04-25, r=RalfJung
bors Apr 25, 2024
e22a73c
Auto merge of #3512 - RalfJung:miri-script-build, r=RalfJung
bors Apr 25, 2024
f38dba6
weak memory outdated loads: show where the load was from
RalfJung Apr 23, 2024
ea9cff2
add a test for the TLS memory leak
RalfJung Apr 23, 2024
247e82c
run many-seeds tests at least a few times on all tier 1 targets
RalfJung Apr 23, 2024
9713294
Auto merge of #3501 - RalfJung:tls-many-seeds, r=RalfJung
bors Apr 25, 2024
505e4dd
CI: run benches with hyperfine rather than bash
RalfJung Apr 25, 2024
d93f9ae
Auto merge of #3514 - RalfJung:hyperfine, r=RalfJung
bors Apr 25, 2024
9f7194b
update lockfile
RalfJung Apr 25, 2024
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
6 changes: 4 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -491,9 +491,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"

[[package]]
name = "chrono"
version = "0.4.37"
version = "0.4.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
dependencies = [
"android-tzdata",
"iana-time-zone",
Expand Down Expand Up @@ -2493,8 +2493,10 @@ name = "miri"
version = "0.1.0"
dependencies = [
"aes",
"chrono",
"colored",
"ctrlc",
"directories",
"getrandom",
"jemalloc-sys",
"lazy_static",
Expand Down
16 changes: 8 additions & 8 deletions src/tools/miri/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
env:
HOST_TARGET: ${{ matrix.host_target }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Show Rust version (stable toolchain)
run: |
Expand All @@ -57,12 +57,12 @@ jobs:
~/.cargo/bin
~/.cargo/.crates.toml
~/.cargo/.crates2.json
key: cargo-${{ runner.os }}-reset20240331-${{ hashFiles('**/Cargo.lock') }}
restore-keys: cargo-${{ runner.os }}-reset20240331
key: cargo-${{ runner.os }}-reset20240425-${{ hashFiles('**/Cargo.lock') }}
restore-keys: cargo-${{ runner.os }}-reset20240425

- name: Install rustup-toolchain-install-master
- name: Install tools
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
run: cargo install -f rustup-toolchain-install-master
run: cargo install -f rustup-toolchain-install-master hyperfine

- name: Install miri toolchain
run: |
Expand All @@ -85,7 +85,7 @@ jobs:
name: style checks
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# This is exactly duplicated from above. GHA is pretty terrible when it comes
# to avoiding code duplication.
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
name: cronjob failure notification
runs-on: ubuntu-latest
needs: [build, style]
if: github.event_name == 'schedule' && (failure() || cancelled())
if: github.event_name == 'schedule' && failure()
steps:
# Send a Zulip notification
- name: Install zulip-send
Expand All @@ -191,7 +191,7 @@ jobs:
The Miri Cronjobs Bot'

# Attempt to auto-sync with rustc
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 256 # get a bit more of the history
- name: install josh-proxy
Expand Down
193 changes: 193 additions & 0 deletions src/tools/miri/Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,21 @@ dependencies = [
"memchr",
]

[[package]]
name = "android-tzdata"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"

[[package]]
name = "android_system_properties"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
dependencies = [
"libc",
]

[[package]]
name = "annotate-snippets"
version = "0.9.2"
Expand Down Expand Up @@ -106,6 +121,12 @@ dependencies = [
"serde",
]

[[package]]
name = "bumpalo"
version = "3.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"

[[package]]
name = "camino"
version = "1.1.6"
Expand Down Expand Up @@ -150,6 +171,18 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

[[package]]
name = "chrono"
version = "0.4.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
dependencies = [
"android-tzdata",
"iana-time-zone",
"num-traits",
"windows-targets 0.52.3",
]

[[package]]
name = "cipher"
version = "0.4.4"
Expand Down Expand Up @@ -216,6 +249,12 @@ dependencies = [
"windows-sys 0.52.0",
]

[[package]]
name = "core-foundation-sys"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"

[[package]]
name = "cpufeatures"
version = "0.2.12"
Expand Down Expand Up @@ -260,6 +299,27 @@ dependencies = [
"windows-sys 0.52.0",
]

[[package]]
name = "directories"
version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
dependencies = [
"dirs-sys",
]

[[package]]
name = "dirs-sys"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [
"libc",
"option-ext",
"redox_users",
"windows-sys 0.48.0",
]

[[package]]
name = "encode_unicode"
version = "0.3.6"
Expand Down Expand Up @@ -319,6 +379,29 @@ version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"

[[package]]
name = "iana-time-zone"
version = "0.1.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
"windows-core",
]

[[package]]
name = "iana-time-zone-haiku"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
"cc",
]

[[package]]
name = "indenter"
version = "0.3.3"
Expand Down Expand Up @@ -372,6 +455,15 @@ dependencies = [
"libc",
]

[[package]]
name = "js-sys"
version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
dependencies = [
"wasm-bindgen",
]

[[package]]
name = "lazy_static"
version = "1.4.0"
Expand Down Expand Up @@ -419,6 +511,16 @@ dependencies = [
"windows-sys 0.48.0",
]

[[package]]
name = "libredox"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.4.2",
"libc",
]

[[package]]
name = "linux-raw-sys"
version = "0.4.13"
Expand Down Expand Up @@ -484,8 +586,10 @@ name = "miri"
version = "0.1.0"
dependencies = [
"aes",
"chrono",
"colored",
"ctrlc",
"directories",
"getrandom",
"jemalloc-sys",
"lazy_static",
Expand All @@ -512,6 +616,15 @@ dependencies = [
"libc",
]

[[package]]
name = "num-traits"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
dependencies = [
"autocfg",
]

[[package]]
name = "number_prefix"
version = "0.4.0"
Expand All @@ -533,6 +646,12 @@ version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"

[[package]]
name = "option-ext"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"

[[package]]
name = "owo-colors"
version = "3.5.0"
Expand Down Expand Up @@ -665,6 +784,17 @@ dependencies = [
"bitflags 1.3.2",
]

[[package]]
name = "redox_users"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
dependencies = [
"getrandom",
"libredox",
"thiserror",
]

[[package]]
name = "regex"
version = "1.10.3"
Expand Down Expand Up @@ -964,6 +1094,60 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

[[package]]
name = "wasm-bindgen"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
]

[[package]]
name = "wasm-bindgen-backend"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-shared",
]

[[package]]
name = "wasm-bindgen-macro"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
]

[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]

[[package]]
name = "wasm-bindgen-shared"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"

[[package]]
name = "winapi"
version = "0.3.9"
Expand All @@ -986,6 +1170,15 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

[[package]]
name = "windows-core"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
"windows-targets 0.52.3",
]

[[package]]
name = "windows-sys"
version = "0.48.0"
Expand Down
2 changes: 2 additions & 0 deletions src/tools/miri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ smallvec = "1.7"
aes = { version = "0.8.3", features = ["hazmat"] }
measureme = "11"
ctrlc = "3.2.5"
chrono = { version = "0.4.38", default-features = false, features = ["clock"] }
directories = "5"

# Copied from `compiler/rustc/Cargo.toml`.
# But only for some targets, it fails for others. Rustc configures this in its CI, but we can't
Expand Down
Loading