Skip to content
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

Miri subtree update #134604

Merged
merged 51 commits into from
Dec 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c1875bf
add test to demonstrate the effect of #4008
JoJoDeveloping Dec 4, 2024
b984eaa
Preparing for merge from rustc
RalfJung Dec 9, 2024
c498e7f
Merge from rustc
RalfJung Dec 9, 2024
ac667ef
Merge pull request #4082 from RalfJung/rustup
RalfJung Dec 9, 2024
4917fe5
Enable `[bot-pull-requests]` triagebot feature
Kobzol Dec 9, 2024
24d164e
Merge pull request #4083 from Kobzol/bot-autoclose
saethlin Dec 9, 2024
0f920db
TB: optimize accesses on large trees by ignoring subtrees if the acce…
JoJoDeveloping Dec 4, 2024
e2496df
Merge pull request #4008 from JoJoDeveloping/tb-access-state-based-sk…
RalfJung Dec 11, 2024
844635d
./miri bench: set toolchain explicitly
RalfJung Dec 11, 2024
6748167
Merge pull request #4087 from RalfJung/bench-toolchain
RalfJung Dec 11, 2024
579b680
solarish stat following-up, supports for readdir.
devnexen Dec 2, 2024
0272b6c
ci TEST_BENCH: show output
RalfJung Dec 12, 2024
b7565cb
./miri bench: add a flag to skip the install step
RalfJung Dec 12, 2024
658edd4
Merge pull request #4089 from RalfJung/ci-bench
RalfJung Dec 12, 2024
4e8a734
Merge pull request #4068 from devnexen/solarish_stat2
RalfJung Dec 12, 2024
c7b8ee0
bench-cargo-miri: bump lockfiles
RalfJung Dec 12, 2024
11ab793
Merge pull request #4091 from RalfJung/bench-bump
RalfJung Dec 12, 2024
6cbd1eb
Improve timezone handling in 'localtime_r()' using 'allocate_bytes()'
shamb0 Dec 3, 2024
b9f1aed
Merge pull request #4069 from shamb0/string_deduplication_for_localti…
RalfJung Dec 12, 2024
cc797a2
Preparing for merge from rustc
RalfJung Dec 12, 2024
f590fa9
Merge from rustc
RalfJung Dec 12, 2024
202098e
fix use of this.allocate_bytes
RalfJung Dec 12, 2024
8e8d6d6
Merge pull request #4092 from RalfJung/rustup
RalfJung Dec 12, 2024
70628f8
Preparing for merge from rustc
Dec 13, 2024
8652177
Merge from rustc
Dec 13, 2024
55db25b
Merge pull request #4094 from rust-lang/rustup-2024-12-13
oli-obk Dec 13, 2024
c1657ca
experiment with using clap
Mandragorian Nov 16, 2024
d12597f
Update miri-script/src/main.rs
Mandragorian Dec 13, 2024
de5201f
address comments
Mandragorian Dec 13, 2024
7d40bb9
fix 'rustc-push' and adjust help texts
RalfJung Dec 14, 2024
d5322f7
Merge pull request #4036 from Mandragorian/clap
RalfJung Dec 14, 2024
8f49799
Preparing for merge from rustc
Dec 15, 2024
581989d
Merge from rustc
Dec 15, 2024
e999c48
Merge pull request #4095 from rust-lang/rustup-2024-12-15
oli-obk Dec 15, 2024
b6120f9
Preparing for merge from rustc
Dec 18, 2024
d49845e
Merge from rustc
Dec 18, 2024
955ef09
Merge pull request #4097 from rust-lang/rustup-2024-12-18
oli-obk Dec 18, 2024
1f77130
Implement blocking unnamed_socket
tiif Nov 28, 2024
4ce3b85
Merge pull request #4072 from tiif/blockop
oli-obk Dec 18, 2024
e28b1d7
add warning explaining the limitations of the native code mode
RalfJung Dec 19, 2024
0aec399
Merge pull request #4098 from RalfJung/native-call-warning
oli-obk Dec 19, 2024
09c8eb5
Preparing for merge from rustc
Dec 20, 2024
5e2ce7e
Merge from rustc
Dec 20, 2024
db960a2
Merge pull request #4100 from rust-lang/rustup-2024-12-20
RalfJung Dec 20, 2024
fafe0ce
Preparing for merge from rustc
RalfJung Dec 20, 2024
fe35924
Merge from rustc
RalfJung Dec 20, 2024
9659fbc
fmt
RalfJung Dec 20, 2024
fddff47
Merge pull request #4101 from RalfJung/rustup
RalfJung Dec 20, 2024
9dac973
Preparing for merge from rustc
Dec 21, 2024
591c47b
Merge from rustc
Dec 21, 2024
268a5f4
Merge pull request #4102 from rust-lang/rustup-2024-12-21
oli-obk Dec 21, 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
23 changes: 13 additions & 10 deletions src/tools/miri/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -375,16 +375,19 @@ to Miri failing to detect cases of undefined behavior in a program.
* `-Zmiri-disable-weak-memory-emulation` disables the emulation of some C++11 weak
memory effects.
* `-Zmiri-native-lib=<path to a shared object file>` is an experimental flag for providing support
for calling native functions from inside the interpreter via FFI. Functions not provided by that
file are still executed via the usual Miri shims.
**WARNING**: If an invalid/incorrect `.so` file is specified, this can cause Undefined Behavior in Miri itself!
And of course, Miri cannot do any checks on the actions taken by the native code.
Note that Miri has its own handling of file descriptors, so if you want to replace *some* functions
working on file descriptors, you will have to replace *all* of them, or the two kinds of
file descriptors will be mixed up.
This is **work in progress**; currently, only integer arguments and return values are
supported (and no, pointer/integer casts to work around this limitation will not work;
they will fail horribly). It also only works on Unix hosts for now.
for calling native functions from inside the interpreter via FFI. The flag is supported only on
Unix systems. Functions not provided by that file are still executed via the usual Miri shims.
**WARNING**: If an invalid/incorrect `.so` file is specified, this can cause Undefined Behavior in
Miri itself! And of course, Miri cannot do any checks on the actions taken by the native code.
Note that Miri has its own handling of file descriptors, so if you want to replace *some*
functions working on file descriptors, you will have to replace *all* of them, or the two kinds of
file descriptors will be mixed up. This is **work in progress**; currently, only integer and
pointers arguments and return values are supported and memory allocated by the native code cannot
be accessed from Rust (only the other way around). Native code must not spawn threads that keep
running in the background after the call has returned to Rust and that access Rust-allocated
memory. Finally, the flag is **unsound** in the sense that Miri stops tracking details such as
initialization and provenance on memory shared with native code, so it is easily possible to write
code that has UB which is missed by Miri.
* `-Zmiri-measureme=<name>` enables `measureme` profiling for the interpreted program.
This can be used to find which parts of your program are executing slowly under Miri.
The profile is written out to a file inside a directory called `<name>`, and can be processed
Expand Down
117 changes: 83 additions & 34 deletions src/tools/miri/bench-cargo-miri/backtraces/Cargo.lock
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
version = 4

[[package]]
name = "addr2line"
version = "0.17.0"
version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]

[[package]]
name = "adler"
version = "1.0.2"
name = "adler2"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"

[[package]]
name = "backtrace"
version = "0.3.65"
version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
"cc",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
"windows-targets",
]

[[package]]
Expand All @@ -39,15 +39,6 @@ dependencies = [
"backtrace",
]

[[package]]
name = "cc"
version = "1.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
dependencies = [
"shlex",
]

[[package]]
name = "cfg-if"
version = "1.0.0"
Expand All @@ -56,48 +47,106 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

[[package]]
name = "gimli"
version = "0.26.1"
version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"

[[package]]
name = "libc"
version = "0.2.126"
version = "0.2.168"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"

[[package]]
name = "memchr"
version = "2.5.0"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"

[[package]]
name = "miniz_oxide"
version = "0.5.3"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
"adler",
"adler2",
]

[[package]]
name = "object"
version = "0.28.4"
version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]

[[package]]
name = "rustc-demangle"
version = "0.1.21"
version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"

[[package]]
name = "windows-targets"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_gnullvm",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]

[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"

[[package]]
name = "windows_i686_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

[[package]]
name = "shlex"
version = "1.3.0"
name = "windows_x86_64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
45 changes: 26 additions & 19 deletions src/tools/miri/bench-cargo-miri/serde1/Cargo.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
version = 4

[[package]]
name = "cargo-miri-test"
Expand All @@ -12,48 +12,54 @@ dependencies = [

[[package]]
name = "itoa"
version = "1.0.2"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"

[[package]]
name = "memchr"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"

[[package]]
name = "proc-macro2"
version = "1.0.39"
version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
dependencies = [
"unicode-ident",
]

[[package]]
name = "quote"
version = "1.0.18"
version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]

[[package]]
name = "ryu"
version = "1.0.10"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"

[[package]]
name = "serde"
version = "1.0.137"
version = "1.0.216"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
dependencies = [
"serde_derive",
]

[[package]]
name = "serde_derive"
version = "1.0.137"
version = "1.0.216"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
dependencies = [
"proc-macro2",
"quote",
Expand All @@ -62,20 +68,21 @@ dependencies = [

[[package]]
name = "serde_json"
version = "1.0.81"
version = "1.0.133"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
dependencies = [
"itoa",
"memchr",
"ryu",
"serde",
]

[[package]]
name = "syn"
version = "1.0.96"
version = "2.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
dependencies = [
"proc-macro2",
"quote",
Expand All @@ -84,6 +91,6 @@ dependencies = [

[[package]]
name = "unicode-ident"
version = "1.0.0"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
Loading
Loading