Skip to content

Miri subtree update #124727

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 84 commits into from
May 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
2681edf
josh rustc-pull: check that no new root commits get created
RalfJung Apr 27, 2024
39f7a46
fix: usage of `deprecated` version of `Node.js`
hamirmahal Apr 27, 2024
f5ceb4e
Auto merge of #3519 - hamirmahal:fix/usage-of-deprecated-version-of-n…
bors Apr 27, 2024
45d9394
Auto merge of #3520 - RalfJung:josh-check, r=RalfJung
bors Apr 27, 2024
ee47a8e
Add doc comment to `pack_generic`
eduardosm Apr 27, 2024
b3b1b49
Clarify behavior of AVX2 gather when dest and offsets have different …
eduardosm Apr 27, 2024
b261535
Do not implement x86 SIMD abs with host integers
eduardosm Apr 27, 2024
5c6f95c
Auto merge of #3521 - eduardosm:avx2-2, r=RalfJung
bors Apr 28, 2024
b5482aa
file descriptors: make write take &mut self
RalfJung Apr 28, 2024
bc8ea93
Auto merge of #3524 - RalfJung:fd-write, r=RalfJung
bors Apr 28, 2024
622f697
Use the interpreted program's TZ variable in localtime_r
saethlin Apr 27, 2024
9bed19e
Refactor UnixEnvVars::get so that it can be reused by getenv
saethlin Apr 28, 2024
7afef08
don't leak UnixEnvVars impl details into get_env_var
RalfJung Apr 29, 2024
1c7e827
Auto merge of #3523 - saethlin:localtime_r-env, r=RalfJung
bors Apr 29, 2024
1cf951e
Don’t print `Preparing a sysroot` when `-q`/`--quiet` is passed
narpfel May 1, 2024
4b42626
fix usage example for `--print-sysroot`
narpfel May 1, 2024
a2b3211
no longer strip `Preparing a sysroot` message from test output
narpfel May 1, 2024
b0bdbcc
Auto merge of #3531 - narpfel:quiet-sysroot, r=RalfJung
bors May 1, 2024
aa986f0
Tree Borrows: first apply transition, then check protector with new '…
RalfJung May 2, 2024
ca3defe
Auto merge of #3532 - RalfJung:tb-protectors, r=RalfJung
bors May 2, 2024
36caaa9
update host-float comments
RalfJung May 2, 2024
f6c0090
Auto merge of #3535 - RalfJung:host-float, r=RalfJung
bors May 2, 2024
56bb517
Add assign
tiif May 2, 2024
aeef180
Preparing for merge from rustc
May 3, 2024
3e2164f
Merge from rustc
May 3, 2024
b348e41
update comments and URL
RalfJung May 3, 2024
3c6d194
Auto merge of #3536 - tiif:add_rustbot_feat, r=RalfJung
bors May 3, 2024
4af1ba0
update lockfile
RalfJung May 3, 2024
5ce8532
Auto merge of #3537 - rust-lang:rustup-2024-05-03, r=RalfJung
bors May 3, 2024
03589bf
run clippy on a Windows host
RalfJung May 3, 2024
8a31014
Auto merge of #3542 - RalfJung:clippy-win, r=RalfJung
bors May 3, 2024
0de07d8
Preparing for merge from rustc
RalfJung May 3, 2024
dcf956c
Auto merge of #3544 - RalfJung:rustup, r=RalfJung
bors May 3, 2024
eaf30ce
./miri run: support -v flag to print what it is doing
RalfJung May 3, 2024
692b769
Auto merge of #3545 - RalfJung:miri-run, r=RalfJung
bors May 3, 2024
aa71f9b
CI: no need to surround if: condition in expansion braces
RalfJung May 3, 2024
74701dc
Auto merge of #3547 - RalfJung:ci, r=RalfJung
bors May 3, 2024
6ce00aa
make many-seeds a mode of ./miri run rather than a separate command
RalfJung May 3, 2024
f7a3aa9
remove a hack that is no longer needed
RalfJung May 4, 2024
38715f7
Auto merge of #3548 - RalfJung:many-seeds, r=RalfJung
bors May 4, 2024
6559342
tls dtors: treat all unixes uniformly
RalfJung May 4, 2024
82456b4
Auto merge of #3550 - RalfJung:unix-tls, r=RalfJung
bors May 4, 2024
07a517a
macos: use getentropy from libc
RalfJung May 4, 2024
705d48c
Auto merge of #3551 - RalfJung:getentropy, r=RalfJung
bors May 4, 2024
459c6ce
Make file descriptors into refcount references
Luv-Ray May 4, 2024
d130eaa
speed up Windows runner: don't run GC_STRESS test
RalfJung May 4, 2024
502ed49
show time taken in run_tests_minimal
RalfJung May 4, 2024
7b57f12
Auto merge of #3533 - Luv-Ray:file-descriptors-to-refcount-references…
bors May 4, 2024
be874a4
move available-parallelism tests into shims/ folder
RalfJung May 4, 2024
57ff16b
rename integer test
RalfJung May 4, 2024
3046dbe
move intrinsics implementations and tests into dedicated folder
RalfJung May 4, 2024
a4355bb
fix grouping of target-specific LLVM shims
RalfJung May 4, 2024
52bf84f
move some minimal targets over to the macOS runner, to even out CI times
RalfJung May 4, 2024
9d4eea1
Auto merge of #3556 - RalfJung:intrinsics, r=RalfJung
bors May 4, 2024
49cd705
Auto merge of #3552 - RalfJung:ci, r=RalfJung
bors May 4, 2024
e1c3d67
Revert "moving out sched_getaffinity interception from linux'shim, Fr…
RalfJung May 4, 2024
8b4b259
update 'unsupported' message
RalfJung May 4, 2024
6df585a
freebsd: test std threadname and fs APIs
RalfJung May 4, 2024
38598e6
document unofficially supported OSes
RalfJung May 4, 2024
05e7850
make some tests not need output (so they work on wasm)
RalfJung May 4, 2024
fd15dc3
Auto merge of #3558 - RalfJung:unsupported, r=RalfJung
bors May 4, 2024
3a6faee
Auto merge of #3554 - RalfJung:freebsd, r=RalfJung
bors May 4, 2024
823e31d
add helper function to declare an extern static for a weak symbol
RalfJung May 4, 2024
19aa8a0
make statx a regular function (so we don't need to support the syscall)
RalfJung May 4, 2024
37537d1
Auto merge of #3559 - RalfJung:weak-extern-static, r=RalfJung
bors May 4, 2024
98bb8ac
sync: better error in invalid synchronization primitive ID
RalfJung May 4, 2024
86d7dff
factor some pthread offset into constants
RalfJung May 4, 2024
9503c41
also test pthread_condattr_getclock
RalfJung May 4, 2024
c3f2701
Auto merge of #3560 - RalfJung:sync-check-id, r=RalfJung
bors May 4, 2024
adb74ae
Preparing for merge from rustc
RalfJung May 4, 2024
0c98929
Merge from rustc
RalfJung May 4, 2024
c6e273c
bless and fmt
RalfJung May 4, 2024
a040df7
remove some dead code
RalfJung May 4, 2024
7eda989
Auto merge of #3557 - RalfJung:getaffinity, r=RalfJung
bors May 4, 2024
d0e7772
Auto merge of #3561 - RalfJung:rustup, r=RalfJung
bors May 4, 2024
cdf3f3c
only show the 'basic API common for this target' message when this is…
RalfJung May 4, 2024
82a8059
Auto merge of #3562 - RalfJung:unsupported, r=RalfJung
bors May 4, 2024
89e8288
Preparing for merge from rustc
RalfJung May 4, 2024
8db37a3
Merge from rustc
RalfJung May 4, 2024
ef5a574
rustc_pull: explain order of operations
RalfJung May 4, 2024
85e061a
fix/extend some comments
RalfJung May 4, 2024
745e3f2
make ExitProcess Windows-only
RalfJung May 4, 2024
e3fe30d
Auto merge of #3563 - RalfJung:rustup, r=RalfJung
bors May 4, 2024
b5051c5
update lockfile
RalfJung May 4, 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
88 changes: 79 additions & 9 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,28 @@ dependencies = [
"windows-targets 0.52.4",
]

[[package]]
name = "chrono-tz"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
dependencies = [
"chrono",
"chrono-tz-build",
"phf 0.11.2",
]

[[package]]
name = "chrono-tz-build"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
dependencies = [
"parse-zoneinfo",
"phf 0.11.2",
"phf_codegen 0.11.2",
]

[[package]]
name = "cipher"
version = "0.4.4"
Expand Down Expand Up @@ -2318,8 +2340,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
dependencies = [
"log",
"phf",
"phf_codegen",
"phf 0.10.1",
"phf_codegen 0.10.0",
"string_cache",
"string_cache_codegen",
"tendril",
Expand Down Expand Up @@ -2480,6 +2502,7 @@ version = "0.1.0"
dependencies = [
"aes",
"chrono",
"chrono-tz",
"colored",
"ctrlc",
"directories",
Expand Down Expand Up @@ -2835,6 +2858,15 @@ dependencies = [
"windows-targets 0.48.5",
]

[[package]]
name = "parse-zoneinfo"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
dependencies = [
"regex",
]

[[package]]
name = "pathdiff"
version = "0.2.1"
Expand Down Expand Up @@ -2907,7 +2939,16 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
dependencies = [
"phf_shared",
"phf_shared 0.10.0",
]

[[package]]
name = "phf"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
dependencies = [
"phf_shared 0.11.2",
]

[[package]]
Expand All @@ -2916,8 +2957,18 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
dependencies = [
"phf_generator",
"phf_shared",
"phf_generator 0.10.0",
"phf_shared 0.10.0",
]

[[package]]
name = "phf_codegen"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
dependencies = [
"phf_generator 0.11.2",
"phf_shared 0.11.2",
]

[[package]]
Expand All @@ -2926,7 +2977,17 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
dependencies = [
"phf_shared",
"phf_shared 0.10.0",
"rand",
]

[[package]]
name = "phf_generator"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
dependencies = [
"phf_shared 0.11.2",
"rand",
]

Expand All @@ -2939,6 +3000,15 @@ dependencies = [
"siphasher",
]

[[package]]
name = "phf_shared"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
dependencies = [
"siphasher",
]

[[package]]
name = "pin-project-lite"
version = "0.2.14"
Expand Down Expand Up @@ -5285,7 +5355,7 @@ dependencies = [
"new_debug_unreachable",
"once_cell",
"parking_lot",
"phf_shared",
"phf_shared 0.10.0",
"precomputed-hash",
"serde",
]
Expand All @@ -5296,8 +5366,8 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
dependencies = [
"phf_generator",
"phf_shared",
"phf_generator 0.10.0",
"phf_shared 0.10.0",
"proc-macro2",
"quote",
]
Expand Down
14 changes: 10 additions & 4 deletions src/tools/miri/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
# over time).
- name: Add cache for cargo
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
# Taken from <https://doc.rust-lang.org/nightly/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci>.
Expand All @@ -61,7 +61,7 @@ jobs:
restore-keys: cargo-${{ runner.os }}-reset20240425

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

- name: Install miri toolchain
Expand All @@ -78,6 +78,12 @@ jobs:
rustc -Vv
cargo -V

# The `style` job only runs on Linux; this makes sure the Windows-host-specific
# code is also covered by clippy.
- name: Check clippy
if: matrix.os == 'windows-latest'
run: ./miri clippy -- -D warnings

- name: Test Miri
run: ./ci/ci.sh

Expand All @@ -95,7 +101,7 @@ jobs:
# over time).
- name: Add cache for cargo
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
# Taken from <https://doc.rust-lang.org/nightly/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci>.
Expand All @@ -111,7 +117,7 @@ jobs:
restore-keys: cargo-${{ runner.os }}-reset20240331

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

- name: Install "master" toolchain
Expand Down
Loading
Loading