Skip to content

Miri subtree update #143137

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 40 commits into from
Jun 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
de213b9
Preparing for merge from rustc
Jun 17, 2025
fdc01cf
Merge from rustc
Jun 17, 2025
7dfa752
Merge pull request #4402 from rust-lang/rustup-2025-06-17
RalfJung Jun 17, 2025
fc7480a
Preparing for merge from rustc
Jun 18, 2025
140479d
Merge from rustc
Jun 18, 2025
e8fccab
Merge pull request #4404 from rust-lang/rustup-2025-06-18
RalfJung Jun 18, 2025
2701dbb
minimal ptrace setup
nia-e May 27, 2025
e857c65
Merge pull request #4401 from nia-e/barebones-ptrace
oli-obk Jun 18, 2025
19c6f75
Preparing for merge from rustc
Jun 19, 2025
e943342
Merge from rustc
Jun 19, 2025
c35c60d
Merge pull request #4407 from rust-lang/rustup-2025-06-19
RalfJung Jun 19, 2025
a009612
Allow building Miri with --features from miri-script
Stypox Apr 9, 2025
487feb9
Merge pull request #4396 from Stypox/build-with-features
RalfJung Jun 19, 2025
a9cc316
isolated_alloc: directly use mmap for allocations
nia-e May 31, 2025
9eee9ee
Merge pull request #4362 from nia-e/fix-alloc-perf
RalfJung Jun 20, 2025
422cd5d
Preparing for merge from rustc
Jun 20, 2025
fd7fb5e
Merge from rustc
Jun 20, 2025
c461e50
Merge pull request #4409 from rust-lang/rustup-2025-06-20
RalfJung Jun 20, 2025
fdc2d52
supervisor bits of ffi ptracing
nia-e May 27, 2025
d20f3a8
fix dumb mistake
nia-e Jun 19, 2025
6a0976a
cfg if
nia-e Jun 20, 2025
a536d89
nonnulls
nia-e Jun 20, 2025
d59518d
error rework
nia-e Jun 20, 2025
02df2b1
Update src/shims/trace/parent.rs
nia-e Jun 20, 2025
733284f
fmt
nia-e Jun 20, 2025
7f0dbba
Merge pull request #4405 from nia-e/standalone-ptrace
oli-obk Jun 21, 2025
bfa933a
Delay writing of return value of a join until after the join is succe…
Patrick-6 Jun 19, 2025
0390197
Merge pull request #4408 from Patrick-6/rework-thread-join
RalfJung Jun 26, 2025
34949e3
Preparing for merge from rustc
Jun 28, 2025
3d8d4d4
Merge from rustc
Jun 28, 2025
cff5a7c
fmt
Jun 28, 2025
35e6def
clippy
RalfJung Jun 28, 2025
96a70e2
Merge pull request #4417 from rust-lang/rustup-2025-06-28
RalfJung Jun 28, 2025
62bb621
various minor native-lib-tracing tweaks, and disable naive-lib-tracin…
RalfJung Jun 28, 2025
cde1012
de-intend some code, and extend comments
RalfJung Jun 28, 2025
5e14d0f
move all the message types into one place
RalfJung Jun 28, 2025
d6f9435
Merge pull request #4418 from RalfJung/native-lib-tracing
RalfJung Jun 28, 2025
85357d1
update lockfile
RalfJung Jun 28, 2025
a317123
fix miri build in bootstrap
RalfJung Jun 28, 2025
e562940
disable ptrace codepath since it doesn't build on many targets
RalfJung Jun 28, 2025
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
151 changes: 135 additions & 16 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,26 @@ dependencies = [
"serde",
]

[[package]]
name = "capstone"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "015ef5d5ca1743e3f94af9509ba6bd2886523cfee46e48d15c2ef5216fd4ac9a"
dependencies = [
"capstone-sys",
"libc",
]

[[package]]
name = "capstone-sys"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2267cb8d16a1e4197863ec4284ffd1aec26fe7e57c58af46b02590a0235809a0"
dependencies = [
"cc",
"libc",
]

[[package]]
name = "cargo-miri"
version = "0.1.0"
Expand Down Expand Up @@ -738,7 +758,7 @@ dependencies = [
"tracing-subscriber",
"unified-diff",
"walkdir",
"windows",
"windows 0.61.3",
]

[[package]]
Expand Down Expand Up @@ -1592,7 +1612,7 @@ dependencies = [
"js-sys",
"log",
"wasm-bindgen",
"windows-core",
"windows-core 0.61.2",
]

[[package]]
Expand Down Expand Up @@ -1916,6 +1936,25 @@ dependencies = [
"unic-langid",
]

[[package]]
name = "ipc-channel"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fb8251fb7bcd9ccd3725ed8deae9fe7db8e586495c9eb5b0c52e6233e5e75ea"
dependencies = [
"bincode",
"crossbeam-channel",
"fnv",
"lazy_static",
"libc",
"mio",
"rand 0.8.5",
"serde",
"tempfile",
"uuid",
"windows 0.58.0",
]

[[package]]
name = "is_terminal_polyfill"
version = "1.70.1"
Expand Down Expand Up @@ -2301,6 +2340,18 @@ dependencies = [
"adler2",
]

[[package]]
name = "mio"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
dependencies = [
"libc",
"log",
"wasi 0.11.1+wasi-snapshot-preview1",
"windows-sys 0.59.0",
]

[[package]]
name = "miow"
version = "0.6.0"
Expand All @@ -2316,18 +2367,22 @@ version = "0.1.0"
dependencies = [
"aes",
"bitflags",
"capstone",
"chrono",
"chrono-tz",
"colored",
"directories",
"getrandom 0.3.3",
"ipc-channel",
"libc",
"libffi",
"libloading",
"measureme",
"nix",
"rand 0.9.1",
"regex",
"rustc_version",
"serde",
"smallvec",
"tempfile",
"tikv-jemalloc-sys",
Expand Down Expand Up @@ -3519,7 +3574,7 @@ dependencies = [
"thorin-dwp",
"tracing",
"wasm-encoder 0.219.2",
"windows",
"windows 0.61.3",
]

[[package]]
Expand Down Expand Up @@ -3578,7 +3633,7 @@ dependencies = [
"tempfile",
"thin-vec",
"tracing",
"windows",
"windows 0.61.3",
]

[[package]]
Expand Down Expand Up @@ -3641,7 +3696,7 @@ dependencies = [
"shlex",
"stable_mir",
"tracing",
"windows",
"windows 0.61.3",
]

[[package]]
Expand Down Expand Up @@ -3696,7 +3751,7 @@ dependencies = [
"termcolor",
"termize",
"tracing",
"windows",
"windows 0.61.3",
]

[[package]]
Expand Down Expand Up @@ -4457,7 +4512,7 @@ dependencies = [
"rustc_target",
"termize",
"tracing",
"windows",
"windows 0.61.3",
]

[[package]]
Expand Down Expand Up @@ -5142,7 +5197,7 @@ dependencies = [
"libc",
"objc2-core-foundation",
"objc2-io-kit",
"windows",
"windows 0.61.3",
]

[[package]]
Expand Down Expand Up @@ -6034,14 +6089,24 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

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

[[package]]
name = "windows"
version = "0.61.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
dependencies = [
"windows-collections",
"windows-core",
"windows-core 0.61.2",
"windows-future",
"windows-link",
"windows-numerics",
Expand All @@ -6064,7 +6129,20 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
dependencies = [
"windows-core",
"windows-core 0.61.2",
]

[[package]]
name = "windows-core"
version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
dependencies = [
"windows-implement 0.58.0",
"windows-interface 0.58.0",
"windows-result 0.2.0",
"windows-strings 0.1.0",
"windows-targets 0.52.6",
]

[[package]]
Expand All @@ -6073,11 +6151,11 @@ version = "0.61.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
dependencies = [
"windows-implement",
"windows-interface",
"windows-implement 0.60.0",
"windows-interface 0.59.1",
"windows-link",
"windows-result",
"windows-strings",
"windows-result 0.3.4",
"windows-strings 0.4.2",
]

[[package]]
Expand All @@ -6086,11 +6164,22 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
dependencies = [
"windows-core",
"windows-core 0.61.2",
"windows-link",
"windows-threading",
]

[[package]]
name = "windows-implement"
version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.103",
]

[[package]]
name = "windows-implement"
version = "0.60.0"
Expand All @@ -6102,6 +6191,17 @@ dependencies = [
"syn 2.0.103",
]

[[package]]
name = "windows-interface"
version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.103",
]

[[package]]
name = "windows-interface"
version = "0.59.1"
Expand All @@ -6125,10 +6225,19 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
dependencies = [
"windows-core",
"windows-core 0.61.2",
"windows-link",
]

[[package]]
name = "windows-result"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
dependencies = [
"windows-targets 0.52.6",
]

[[package]]
name = "windows-result"
version = "0.3.4"
Expand All @@ -6138,6 +6247,16 @@ dependencies = [
"windows-link",
]

[[package]]
name = "windows-strings"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
dependencies = [
"windows-result 0.2.0",
"windows-targets 0.52.6",
]

[[package]]
name = "windows-strings"
version = "0.4.2"
Expand Down
Loading
Loading