diff options
| author | bors <bors@rust-lang.org> | 2024-08-20 10:21:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-20 10:21:05 +0000 |
| commit | e6e294ababdc9aefb96e27be97e7733217a4122f (patch) | |
| tree | 54175a79c12444b9f2b046242bfc9d619be5bec8 | |
| parent | 0305cee39a27b8a9a59b5c7ec978f17420c4bee8 (diff) | |
| parent | 221932fc4dc443fd741822d08a65705d60e8773b (diff) | |
| download | rust-e6e294ababdc9aefb96e27be97e7733217a4122f.tar.gz rust-e6e294ababdc9aefb96e27be97e7733217a4122f.zip | |
Auto merge of #3748 - RalfJung:freebsd-readdir, r=RalfJung
readdir_r shim: assume FreeBSD v12+ Blocked on https://github.com/rust-lang/libc/pull/3723 being released and propagating to std.
| -rw-r--r-- | src/tools/miri/src/shims/unix/fs.rs | 16 | ||||
| -rw-r--r-- | src/tools/miri/test_dependencies/Cargo.lock | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/tools/miri/src/shims/unix/fs.rs b/src/tools/miri/src/shims/unix/fs.rs index 80f4b89bf34..e00758bb98d 100644 --- a/src/tools/miri/src/shims/unix/fs.rs +++ b/src/tools/miri/src/shims/unix/fs.rs @@ -1204,14 +1204,14 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> { )?; } "freebsd" => { - this.write_int(ino, &this.project_field_named(&entry_place, "d_fileno")?)?; - // `d_off` only exists on FreeBSD 12+, but we support v11 as well. - // `libc` uses a build script to determine which version of the API to use, - // and cross-builds always end up using v11. - // To support both v11 and v12+, we dynamically check whether the field exists. - if this.projectable_has_field(&entry_place, "d_off") { - this.write_int(0, &this.project_field_named(&entry_place, "d_off")?)?; - } + #[rustfmt::skip] + this.write_int_fields_named( + &[ + ("d_fileno", ino.into()), + ("d_off", 0), + ], + &entry_place, + )?; } _ => unreachable!(), } diff --git a/src/tools/miri/test_dependencies/Cargo.lock b/src/tools/miri/test_dependencies/Cargo.lock index e94bef52952..bbead878223 100644 --- a/src/tools/miri/test_dependencies/Cargo.lock +++ b/src/tools/miri/test_dependencies/Cargo.lock @@ -119,9 +119,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "linux-raw-sys" |