Skip to content

Commit 45a45c6

Browse files
borsbors
committed
Auto merge of rust-lang#117011 - RalfJung:miri, r=RalfJung
Miri subtree update r? `@ghost`
2 parents 249624b + 49e8acb commit 45a45c6

35 files changed

+1512
-182
lines changed

‎Cargo.lock

+31
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@ dependencies = [
2424
"rustc-std-workspace-core",
2525
]
2626

27+
[[package]]
28+
name = "aes"
29+
version = "0.8.3"
30+
source = "registry+https://github.com/rust-lang/crates.io-index"
31+
checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
32+
dependencies = [
33+
"cfg-if",
34+
"cipher",
35+
"cpufeatures",
36+
]
37+
2738
[[package]]
2839
name = "ahash"
2940
version = "0.8.3"
@@ -470,6 +481,16 @@ dependencies = [
470481
"winapi",
471482
]
472483

484+
[[package]]
485+
name = "cipher"
486+
version = "0.4.4"
487+
source = "registry+https://github.com/rust-lang/crates.io-index"
488+
checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
489+
dependencies = [
490+
"crypto-common",
491+
"inout",
492+
]
493+
473494
[[package]]
474495
name = "clap"
475496
version = "4.4.4"
@@ -1984,6 +2005,15 @@ version = "1.0.9"
19842005
source = "registry+https://github.com/rust-lang/crates.io-index"
19852006
checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
19862007

2008+
[[package]]
2009+
name = "inout"
2010+
version = "0.1.3"
2011+
source = "registry+https://github.com/rust-lang/crates.io-index"
2012+
checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
2013+
dependencies = [
2014+
"generic-array",
2015+
]
2016+
19872017
[[package]]
19882018
name = "installer"
19892019
version = "0.0.0"
@@ -2465,6 +2495,7 @@ dependencies = [
24652495
name = "miri"
24662496
version = "0.1.0"
24672497
dependencies = [
2498+
"aes",
24682499
"colored",
24692500
"ctrlc",
24702501
"env_logger 0.10.0",

‎src/tools/miri/.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ jobs:
188188
with:
189189
fetch-depth: 256 # get a bit more of the history
190190
- name: install josh-proxy
191-
run: cargo +stable install josh-proxy --git https://github.com/josh-project/josh --tag r22.12.06
191+
run: RUSTFLAGS="--cap-lints warn" cargo +stable install josh-proxy --git https://github.com/josh-project/josh --tag r22.12.06
192192
- name: setup bot git name and email
193193
run: |
194194
git config --global user.name 'The Miri Conjob Bot'
@@ -208,7 +208,7 @@ jobs:
208208
git push -u origin $BRANCH
209209
- name: Create Pull Request
210210
run: |
211-
PR=$(gh pr create -B master --title 'Automatic sync from rustc' --body '')
211+
PR=$(gh pr create -B master --title 'Automatic Rustup' --body '')
212212
~/.local/bin/zulip-send --user $ZULIP_BOT_EMAIL --api-key $ZULIP_API_TOKEN --site https://rust-lang.zulipchat.com \
213213
--stream miri --subject "Cron Job Failure (miri, $(date -u +%Y-%m))" \
214214
--message "A PR doing a rustc-pull [has been automatically created]($PR) for your convenience."

‎src/tools/miri/Cargo.lock

+74-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@ version = "1.0.2"
1717
source = "registry+https://github.com/rust-lang/crates.io-index"
1818
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
1919

20+
[[package]]
21+
name = "aes"
22+
version = "0.8.3"
23+
source = "registry+https://github.com/rust-lang/crates.io-index"
24+
checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
25+
dependencies = [
26+
"cfg-if",
27+
"cipher",
28+
"cpufeatures",
29+
]
30+
2031
[[package]]
2132
name = "aho-corasick"
2233
version = "1.1.1"
@@ -142,6 +153,16 @@ version = "1.0.0"
142153
source = "registry+https://github.com/rust-lang/crates.io-index"
143154
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
144155

156+
[[package]]
157+
name = "cipher"
158+
version = "0.4.4"
159+
source = "registry+https://github.com/rust-lang/crates.io-index"
160+
checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
161+
dependencies = [
162+
"crypto-common",
163+
"inout",
164+
]
165+
145166
[[package]]
146167
name = "color-eyre"
147168
version = "0.6.2"
@@ -199,6 +220,15 @@ dependencies = [
199220
"windows-sys 0.45.0",
200221
]
201222

223+
[[package]]
224+
name = "cpufeatures"
225+
version = "0.2.9"
226+
source = "registry+https://github.com/rust-lang/crates.io-index"
227+
checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
228+
dependencies = [
229+
"libc",
230+
]
231+
202232
[[package]]
203233
name = "crossbeam-channel"
204234
version = "0.5.8"
@@ -218,6 +248,16 @@ dependencies = [
218248
"cfg-if",
219249
]
220250

251+
[[package]]
252+
name = "crypto-common"
253+
version = "0.1.6"
254+
source = "registry+https://github.com/rust-lang/crates.io-index"
255+
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
256+
dependencies = [
257+
"generic-array",
258+
"typenum",
259+
]
260+
221261
[[package]]
222262
name = "ctrlc"
223263
version = "3.4.1"
@@ -284,6 +324,16 @@ version = "2.0.1"
284324
source = "registry+https://github.com/rust-lang/crates.io-index"
285325
checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
286326

327+
[[package]]
328+
name = "generic-array"
329+
version = "0.14.7"
330+
source = "registry+https://github.com/rust-lang/crates.io-index"
331+
checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
332+
dependencies = [
333+
"typenum",
334+
"version_check",
335+
]
336+
287337
[[package]]
288338
name = "getrandom"
289339
version = "0.2.10"
@@ -332,6 +382,15 @@ dependencies = [
332382
"unicode-width",
333383
]
334384

385+
[[package]]
386+
name = "inout"
387+
version = "0.1.3"
388+
source = "registry+https://github.com/rust-lang/crates.io-index"
389+
checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
390+
dependencies = [
391+
"generic-array",
392+
]
393+
335394
[[package]]
336395
name = "instant"
337396
version = "0.1.12"
@@ -469,6 +528,7 @@ dependencies = [
469528
name = "miri"
470529
version = "0.1.0"
471530
dependencies = [
531+
"aes",
472532
"colored",
473533
"ctrlc",
474534
"env_logger",
@@ -726,9 +786,9 @@ dependencies = [
726786

727787
[[package]]
728788
name = "rustix"
729-
version = "0.38.17"
789+
version = "0.38.19"
730790
source = "registry+https://github.com/rust-lang/crates.io-index"
731-
checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7"
791+
checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
732792
dependencies = [
733793
"bitflags 2.4.0",
734794
"errno",
@@ -909,6 +969,12 @@ dependencies = [
909969
"tracing-core",
910970
]
911971

972+
[[package]]
973+
name = "typenum"
974+
version = "1.17.0"
975+
source = "registry+https://github.com/rust-lang/crates.io-index"
976+
checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
977+
912978
[[package]]
913979
name = "ui_test"
914980
version = "0.21.2"
@@ -954,6 +1020,12 @@ version = "0.1.0"
9541020
source = "registry+https://github.com/rust-lang/crates.io-index"
9551021
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
9561022

1023+
[[package]]
1024+
name = "version_check"
1025+
version = "0.9.4"
1026+
source = "registry+https://github.com/rust-lang/crates.io-index"
1027+
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
1028+
9571029
[[package]]
9581030
name = "wasi"
9591031
version = "0.11.0+wasi-snapshot-preview1"

‎src/tools/miri/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ env_logger = "0.10"
2323
log = "0.4"
2424
rand = "0.8"
2525
smallvec = "1.7"
26+
aes = { version = "0.8.3", features = ["hazmat"] }
2627

2728
measureme = "10.0.0"
2829
ctrlc = "3.2.5"

‎src/tools/miri/cargo-miri/Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ dependencies = [
238238

239239
[[package]]
240240
name = "rustix"
241-
version = "0.38.17"
241+
version = "0.38.19"
242242
source = "registry+https://github.com/rust-lang/crates.io-index"
243-
checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7"
243+
checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
244244
dependencies = [
245245
"bitflags 2.4.0",
246246
"errno",

‎src/tools/miri/miri-script/Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ dependencies = [
213213

214214
[[package]]
215215
name = "rustix"
216-
version = "0.38.17"
216+
version = "0.38.19"
217217
source = "registry+https://github.com/rust-lang/crates.io-index"
218-
checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7"
218+
checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
219219
dependencies = [
220220
"bitflags 2.4.0",
221221
"errno",

‎src/tools/miri/rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4ea5190026dbc1302b644d938e68bc6843cb8b24
1+
249624b5043013d18c00f0401ca431c1a6baa8cd

‎src/tools/miri/src/borrow_tracker/tree_borrows/mod.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,7 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
206206
// Make sure the new permission makes sense as the initial permission of a fresh tag.
207207
assert!(new_perm.initial_state.is_initial());
208208
// Ensure we bail out if the pointer goes out-of-bounds (see miri#1050).
209-
this.check_ptr_access(
210-
place.ptr(),
211-
ptr_size,
212-
CheckInAllocMsg::InboundsTest,
213-
)?;
209+
this.check_ptr_access(place.ptr(), ptr_size, CheckInAllocMsg::InboundsTest)?;
214210

215211
// It is crucial that this gets called on all code paths, to ensure we track tag creation.
216212
let log_creation = |this: &MiriInterpCx<'mir, 'tcx>,

‎src/tools/miri/src/concurrency/data_race.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1017,10 +1017,7 @@ trait EvalContextPrivExt<'mir, 'tcx: 'mir>: MiriInterpCxExt<'mir, 'tcx> {
10171017
// even if the type they wrap would be less aligned (e.g. AtomicU64 on 32bit must
10181018
// be 8-aligned).
10191019
let align = Align::from_bytes(place.layout.size.bytes()).unwrap();
1020-
this.check_ptr_align(
1021-
place.ptr(),
1022-
align,
1023-
)?;
1020+
this.check_ptr_align(place.ptr(), align)?;
10241021
// Ensure the allocation is mutable. Even failing (read-only) compare_exchange need mutable
10251022
// memory on many targets (i.e., they segfault if taht memory is mapped read-only), and
10261023
// atomic loads can be implemented via compare_exchange on some targets. There could

‎src/tools/miri/src/helpers.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -868,9 +868,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
868868
let size2 = Size::from_bytes(2);
869869
let this = self.eval_context_mut();
870870
this.check_ptr_align(ptr, Align::from_bytes(2).unwrap())?;
871-
let mut alloc = this
872-
.get_ptr_alloc_mut(ptr, size2 * string_length)?
873-
.unwrap(); // not a ZST, so we will get a result
871+
let mut alloc = this.get_ptr_alloc_mut(ptr, size2 * string_length)?.unwrap(); // not a ZST, so we will get a result
874872
for (offset, wchar) in wide_str.iter().copied().chain(iter::once(0x0000)).enumerate() {
875873
let offset = u64::try_from(offset).unwrap();
876874
alloc.write_scalar(alloc_range(size2 * offset, size2), Scalar::from_u16(wchar))?;

0 commit comments

Comments
 (0)