]>
git.lizzy.rs Git - rust.git/log
Ralf Jung [Fri, 24 Jun 2022 20:21:47 +0000 (16:21 -0400)]
add exposed_only_ro test
carbotaniuman [Thu, 16 Jun 2022 01:55:54 +0000 (20:55 -0500)]
Try fix stuff
carbotaniuman [Thu, 16 Jun 2022 01:53:44 +0000 (20:53 -0500)]
Maybe this wil work
carbotaniuman [Wed, 15 Jun 2022 19:55:21 +0000 (14:55 -0500)]
Handle wildcard pointers in SB
bors [Fri, 24 Jun 2022 13:15:20 +0000 (13:15 +0000)]
Auto merge of #2262 - RalfJung:zulip, r=RalfJung
only one Zulip cron job topic per month
Ralf Jung [Fri, 24 Jun 2022 13:13:36 +0000 (09:13 -0400)]
only one Zulip cron job topic per month
bors [Thu, 23 Jun 2022 20:15:27 +0000 (20:15 +0000)]
Auto merge of #2257 - dtolnay-contrib:rustfmt9, r=RalfJung
Add `./miri fmt` and check in CI
David Tolnay [Thu, 23 Jun 2022 20:08:12 +0000 (13:08 -0700)]
Bless stderr files after rustfmt
David Tolnay [Thu, 23 Jun 2022 19:51:40 +0000 (12:51 -0700)]
Manual adjustments
David Tolnay [Thu, 23 Jun 2022 19:50:44 +0000 (12:50 -0700)]
Format late arrivals with rustfmt
David Tolnay [Wed, 22 Jun 2022 12:00:07 +0000 (05:00 -0700)]
Add './miri fmt' and use it in CI
bors [Thu, 23 Jun 2022 18:53:37 +0000 (18:53 +0000)]
Auto merge of #2261 - RalfJung:fmt, r=oli-obk
make rustfmt mandatory and used pinned toolchain
Looks like this is what most people prefer/expect, and using a pinned toolchain for formatting avoids some (rare and so far mostly hypothetical) formatting inconsistency issues.
Ralf Jung [Thu, 23 Jun 2022 17:57:27 +0000 (13:57 -0400)]
make rustfmt mandatory and used pinned toolchain
bors [Thu, 23 Jun 2022 13:49:56 +0000 (13:49 +0000)]
Auto merge of #2250 - rust-lang:gesundheit, r=oli-obk
Require local annotations for local diagnostics
if/when we get flaky diagnostics we can revisit and add more helpers for those
Oli Scherer [Tue, 21 Jun 2022 16:30:45 +0000 (16:30 +0000)]
Require local annotations for local diagnostics
bors [Wed, 22 Jun 2022 21:39:41 +0000 (21:39 +0000)]
Auto merge of #2248 - RalfJung:arc-drop-fix, r=RalfJung
do not protect SRW items
This is the Miri version of https://github.com/rust-lang/rust/pull/98017.
bors [Wed, 22 Jun 2022 17:05:03 +0000 (17:05 +0000)]
Auto merge of #2259 - RalfJung:cargo-rustc, r=RalfJung
avoid setting both RUSTC and RUSTC_WRAPPER
Fixes https://github.com/rust-lang/miri/issues/2238
Ralf Jung [Wed, 22 Jun 2022 17:02:33 +0000 (10:02 -0700)]
avoid setting both RUSTC and RUSTC_WRAPPER
bors [Wed, 22 Jun 2022 15:53:15 +0000 (15:53 +0000)]
Auto merge of #2258 - RalfJung:fmt, r=RalfJung
fmt
Ralf Jung [Wed, 22 Jun 2022 15:52:48 +0000 (08:52 -0700)]
fmt
bors [Wed, 22 Jun 2022 10:04:08 +0000 (10:04 +0000)]
Auto merge of #2255 - dtolnay-contrib:rustfmt7, r=oli-obk
Format tests with rustfmt (288-299 of 299)
Extracted from #2097.
I'll make a separate PR to enable checking the `tests` directory's formatting in CI. I'll need to rebase that after both this and #2254 have landed, and if any new non-rustfmt-formatted files appear in the meantime, we can include formatting those in the same PR that enables the CI.
bors [Wed, 22 Jun 2022 09:26:44 +0000 (09:26 +0000)]
Auto merge of #2253 - RalfJung:only-bits, r=oli-obk
fix behavior of only-Nbits comments
Fixes https://github.com/rust-lang/miri/issues/2206
bors [Wed, 22 Jun 2022 09:04:44 +0000 (09:04 +0000)]
Auto merge of #2252 - dtolnay-contrib:rustfmt5, r=oli-obk
Format tests with rustfmt (225-275 of 300)
Extracted from #2097.
These cases all involve a line comment at the end of a block that rustfmt has chosen to wrap.
```diff
- unsafe { (*ptr).set(20); } //~ ERROR does not exist in the borrow stack
+ unsafe {
+ (*ptr).set(20);
+ } //~ ERROR does not exist in the borrow stack
```
I have moved all of those comments back onto the same line as the content of the block instead, as was indicated being `@RalfJung's` preference in https://github.com/rust-lang/miri/pull/2097#discussion_r862436672.
```diff
+ unsafe {
+ (*ptr).set(20); //~ ERROR does not exist in the borrow stack
+ }
```
bors [Wed, 22 Jun 2022 08:43:33 +0000 (08:43 +0000)]
Auto merge of #2254 - dtolnay-contrib:rustfmt6, r=oli-obk
Format tests with rustfmt (276-287 of 299)
Extracted from #2097.
This is one half of the last 24 files (left for last because they require more unique attention than the first 275 "easy" files).
I'll comment below to call attention to cases where I exercised my own judgement in how to format the test.
https://github.com/rust-lang/rustfmt/issues/3255 is especially annoying: rustfmt does not like `…( //` and `…{ //`.
David Tolnay [Wed, 22 Jun 2022 06:48:09 +0000 (23:48 -0700)]
Manual adjustments
David Tolnay [Wed, 22 Jun 2022 06:21:37 +0000 (23:21 -0700)]
Bless stderr files after rustfmt
David Tolnay [Wed, 22 Jun 2022 06:03:34 +0000 (23:03 -0700)]
Manual adjustments
David Tolnay [Wed, 22 Jun 2022 05:57:06 +0000 (22:57 -0700)]
Format tests with rustfmt (288-299 of 299)
David Tolnay [Wed, 22 Jun 2022 05:56:50 +0000 (22:56 -0700)]
Format tests with rustfmt (276-287 of 299)
Ralf Jung [Wed, 22 Jun 2022 05:24:18 +0000 (22:24 -0700)]
ui_test: fix behavior of only-Nbits comments
bors [Wed, 22 Jun 2022 04:27:04 +0000 (04:27 +0000)]
Auto merge of #2251 - dtolnay-contrib:rustfmt4, r=RalfJung
Format tests with rustfmt (201-224 of 300)
Extracted from #2097. Last of the easy cases which do not involve moving around a comment.
bors [Wed, 22 Jun 2022 04:04:37 +0000 (04:04 +0000)]
Auto merge of #2241 - RalfJung:extern_static_in_const, r=RalfJung
fix ICE when const refers to extern static
Fixes https://github.com/rust-lang/miri/issues/2234
Needs https://github.com/rust-lang/rust/pull/98099
Ralf Jung [Wed, 22 Jun 2022 04:03:52 +0000 (21:03 -0700)]
rustup
Ralf Jung [Sun, 19 Jun 2022 16:45:05 +0000 (09:45 -0700)]
fix ICE when const refers to extern static
Ralf Jung [Tue, 14 Jun 2022 16:45:02 +0000 (09:45 -0700)]
check that tag_alloc_base_pointer is not called on the wrong things
David Tolnay [Tue, 21 Jun 2022 18:42:19 +0000 (11:42 -0700)]
Bless stderr files after rustfmt
David Tolnay [Tue, 21 Jun 2022 18:40:02 +0000 (11:40 -0700)]
Manual adjustments
David Tolnay [Tue, 21 Jun 2022 18:38:02 +0000 (11:38 -0700)]
Format tests with rustfmt (225-275 of 300)
David Tolnay [Tue, 21 Jun 2022 18:28:24 +0000 (11:28 -0700)]
Bless stderr files after rustfmt
David Tolnay [Tue, 21 Jun 2022 18:28:00 +0000 (11:28 -0700)]
Manual adjustments
David Tolnay [Tue, 21 Jun 2022 18:27:44 +0000 (11:27 -0700)]
Format tests with rustfmt (201-224 of 300)
Ralf Jung [Tue, 21 Jun 2022 05:12:05 +0000 (22:12 -0700)]
do not protect SRW items
Ralf Jung [Tue, 21 Jun 2022 05:02:02 +0000 (22:02 -0700)]
add tests that fail due to SRW protectors
also do more iterations of weak mem consistency, since now that is no longer the slowest test ;)
Ralf Jung [Tue, 21 Jun 2022 04:24:06 +0000 (21:24 -0700)]
move nopreempt sync tests to their own file
bors [Tue, 21 Jun 2022 07:39:16 +0000 (07:39 +0000)]
Auto merge of #2249 - dtolnay-contrib:rustfmt3, r=oli-obk
Format tests with rustfmt (151-200 of 300)
Extracted from #2097.
This PR is still only doing the easy cases with no comments involved.
In the next PRs after this, I'll start grouping by common comment patterns, e.g. all the cases resembling https://github.com/rust-lang/miri/pull/2097#discussion_r862436672 together in one PR.
bors [Tue, 21 Jun 2022 06:57:41 +0000 (06:57 +0000)]
Auto merge of #2246 - dtolnay-contrib:rustfmt1, r=oli-obk
Format tests with rustfmt (51-100 of 300)
Extracted from #2097.
Like #2244, this is intended to be "easy" cases which don't involve comments in the vicinity.
David Tolnay [Tue, 21 Jun 2022 06:49:55 +0000 (23:49 -0700)]
Bless stderr files after rustfmt
David Tolnay [Tue, 21 Jun 2022 06:45:49 +0000 (23:45 -0700)]
Manual adjustments
David Tolnay [Tue, 21 Jun 2022 06:40:39 +0000 (23:40 -0700)]
Format tests with rustfmt (151-200 of 300)
David Tolnay [Mon, 20 Jun 2022 22:43:42 +0000 (15:43 -0700)]
Manual adjustments
bors [Tue, 21 Jun 2022 04:12:42 +0000 (04:12 +0000)]
Auto merge of #2247 - dtolnay-contrib:rustfmt2, r=RalfJung
Format tests with rustfmt (101-150 of 300)
Extracted from #2097.
Like https://github.com/rust-lang/miri/pull/2244, these are "easy" cases that do not involve moving around comments.
bors [Tue, 21 Jun 2022 02:51:35 +0000 (02:51 +0000)]
Auto merge of #2244 - dtolnay-contrib:rustfmt0, r=RalfJung
Format tests and benches with rustfmt (1-50 of 300)
Extracted from #2097.
I filtered this PR to contain exclusively "easy" cases to start off with, i.e. where there is no compiletest_rs (or other) comment in the vicinity that might need to get manually repositioned.
David Tolnay [Mon, 20 Jun 2022 23:08:00 +0000 (16:08 -0700)]
Manual adjustments
David Tolnay [Mon, 20 Jun 2022 23:00:37 +0000 (16:00 -0700)]
Format tests with rustfmt (101-150 of 300)
David Tolnay [Mon, 20 Jun 2022 22:39:27 +0000 (15:39 -0700)]
Bless stdout files after rustfmt
David Tolnay [Mon, 20 Jun 2022 22:30:34 +0000 (15:30 -0700)]
Format tests with rustfmt (51-100 of 300)
David Tolnay [Mon, 20 Jun 2022 09:43:13 +0000 (02:43 -0700)]
Add rustfmt CI for currently formatted directories
David Tolnay [Mon, 20 Jun 2022 09:43:06 +0000 (02:43 -0700)]
Manual adjustments
bors [Mon, 20 Jun 2022 15:12:55 +0000 (15:12 +0000)]
Auto merge of #2243 - saethlin:color-always, r=oli-obk
Pass --color=always through cargo-miri
Closes https://github.com/rust-lang/miri/issues/2037
I just implemented the fix suggested in that issue and it seems to work without issue.
Ben Kimock [Mon, 20 Jun 2022 02:57:10 +0000 (22:57 -0400)]
Pass --color=always through cargo-miri
David Tolnay [Mon, 20 Jun 2022 03:43:35 +0000 (20:43 -0700)]
Bless stderr files after rustfmt
David Tolnay [Mon, 20 Jun 2022 03:33:59 +0000 (20:33 -0700)]
Format tests and benches with rustfmt (1-50 of 300)
bors [Mon, 20 Jun 2022 05:23:46 +0000 (05:23 +0000)]
Auto merge of #2242 - dtolnay-contrib:rustfmtskip, r=RalfJung
Add rustfmt::skip to some files
Extracted from https://github.com/rust-lang/miri/pull/2097.
Five of the files being skipped here are because rustfmt is buggy (https://github.com/rust-lang/rustfmt/issues/5391; see the error messages below). The other two have clearly preferable manual formatting.
```console
error[internal]: left behind trailing whitespace
--> tests/fail/validity/transmute_through_ptr.rs:18:18:1
|
18 |
| ^^^^
|
warning: rustfmt has failed to format. See previous 1 errors.
error[internal]: left behind trailing whitespace
--> tests/fail/stacked_borrows/illegal_read2.rs:10:10:1
|
10 |
| ^^^^
|
warning: rustfmt has failed to format. See previous 1 errors.
error[internal]: left behind trailing whitespace
--> tests/fail/stacked_borrows/illegal_read5.rs:15:15:1
|
15 |
| ^^^^
|
warning: rustfmt has failed to format. See previous 1 errors.
error[internal]: left behind trailing whitespace
--> tests/fail/stacked_borrows/illegal_read1.rs:10:10:1
|
10 |
| ^^^^
|
warning: rustfmt has failed to format. See previous 1 errors.
error[internal]: left behind trailing whitespace
--> /git/miri/tests/fail/erroneous_const2.rs:9:9:1
|
9 |
| ^^^^
|
warning: rustfmt has failed to format. See previous 1 errors.
```
David Tolnay [Sat, 30 Apr 2022 18:07:36 +0000 (11:07 -0700)]
Add rustfmt::skip to some files
Five of the files being skipped here are because rustfmt is buggy (see
the error messages below). The others have clearly preferable manual
formatting.
error[internal]: left behind trailing whitespace
--> tests/fail/validity/transmute_through_ptr.rs:18:18:1
|
18 |
| ^^^^
|
warning: rustfmt has failed to format. See previous 1 errors.
error[internal]: left behind trailing whitespace
--> tests/fail/stacked_borrows/illegal_read2.rs:10:10:1
|
10 |
| ^^^^
|
warning: rustfmt has failed to format. See previous 1 errors.
error[internal]: left behind trailing whitespace
--> tests/fail/stacked_borrows/illegal_read5.rs:15:15:1
|
15 |
| ^^^^
|
warning: rustfmt has failed to format. See previous 1 errors.
error[internal]: left behind trailing whitespace
--> tests/fail/stacked_borrows/illegal_read1.rs:10:10:1
|
10 |
| ^^^^
|
warning: rustfmt has failed to format. See previous 1 errors.
error[internal]: left behind trailing whitespace
--> tests/fail/erroneous_const2.rs:9:9:1
|
9 |
| ^^^^
|
warning: rustfmt has failed to format. See previous 1 errors.
bors [Sun, 19 Jun 2022 16:19:48 +0000 (16:19 +0000)]
Auto merge of #2240 - RalfJung:readme, r=RalfJung
readme
Emulation of weak memory effects is not a kind of UB, so put it into a separate paragraph. Also remove the note about incomplete threading support. :)
Ralf Jung [Sun, 19 Jun 2022 16:18:16 +0000 (09:18 -0700)]
readme
bors [Sat, 18 Jun 2022 15:10:56 +0000 (15:10 +0000)]
Auto merge of #2228 - cbeuw:futex-fix, r=RalfJung
Prevent futex_wait from actually waiting if a concurrent waker was executed before us
Fixes #2223
Two SC fences were placed in `futex_wake` (after the caller has changed `addr`), and in `futex_wait` (before we read `addr`). This guarantees that `futex_wait` sees the value written to `addr` before the last `futex_wake` call, should one exists, and avoid going into sleep with no one else to wake us up.
https://github.com/rust-lang/miri/blob/
ada7b72a879d79aaa06f0a2a95edd520615da1a2 /src/concurrency/weak_memory.rs#L324-L326
Earlier I proposed to use `fetch_add(0)` to read the latest value in MO, though this isn't the proper way to do it and breaks aliasing: syscall caller may pass in a `*const` from a `&` and Miri complains about write to a `SharedReadOnly` location, causing this test to fail.
https://github.com/rust-lang/miri/blob/
ada7b72a879d79aaa06f0a2a95edd520615da1a2 /tests/pass/concurrency/linux-futex.rs#L56-L68
Ralf Jung [Sat, 18 Jun 2022 14:59:46 +0000 (07:59 -0700)]
tweak correctness comment
bors [Sat, 18 Jun 2022 14:50:15 +0000 (14:50 +0000)]
Auto merge of #2239 - RalfJung:rustup, r=RalfJung
rustup
Cc https://github.com/rust-lang/rust/issues/98107
Ralf Jung [Sat, 18 Jun 2022 14:49:40 +0000 (07:49 -0700)]
rustup
bors [Thu, 16 Jun 2022 20:26:12 +0000 (20:26 +0000)]
Auto merge of #2237 - RalfJung:ice, r=oli-obk
add ICE error level
Fixes https://github.com/rust-lang/miri/issues/2235
But I am not sure if anything else should be adjusted when adding a new error level...
bors [Thu, 16 Jun 2022 18:18:39 +0000 (18:18 +0000)]
Auto merge of #2236 - RalfJung:rustup, r=RalfJung
rustup
I feel like tests became a *lot* slower. I am not sure what is going on and don't have time to debug right now.
Ralf Jung [Thu, 16 Jun 2022 17:03:41 +0000 (10:03 -0700)]
rustup
Ralf Jung [Thu, 16 Jun 2022 18:02:54 +0000 (11:02 -0700)]
add ICE error level
Andy Wang [Wed, 15 Jun 2022 00:44:32 +0000 (01:44 +0100)]
Elaborate correctness comments
Andy Wang [Mon, 13 Jun 2022 17:24:19 +0000 (18:24 +0100)]
Reduce the number of iterations
bors [Mon, 13 Jun 2022 16:08:54 +0000 (16:08 +0000)]
Auto merge of #2207 - RalfJung:ui_test_parallelism, r=oli-obk
ui_test: ensure all worker threads stay around
Also organize files such that the by far slowest test (weak_memory/consistency) always starts first. It still finishes last on my system... even after I halved the iteration count.
Fixes https://github.com/rust-lang/miri/issues/2204
Oli Scherer [Mon, 13 Jun 2022 13:20:01 +0000 (15:20 +0200)]
Document file sorting
Ralf Jung [Mon, 6 Jun 2022 22:53:33 +0000 (18:53 -0400)]
organize more files into folders, and run the weak-mem consistency test as the very first since it is so slow
Ralf Jung [Mon, 6 Jun 2022 22:53:19 +0000 (18:53 -0400)]
test files in a deterministic order
Ralf Jung [Mon, 6 Jun 2022 22:34:41 +0000 (18:34 -0400)]
ensure all worker threads stay around
bors [Mon, 13 Jun 2022 13:44:16 +0000 (13:44 +0000)]
Auto merge of #2232 - rust-lang:gesundheit, r=oli-obk
Always show stderr on test failure.
fixes #2224
I overengineered the original thing to the point where it became fragile. Let's just always print stderr, unless it was already printed
bors [Mon, 13 Jun 2022 13:13:29 +0000 (13:13 +0000)]
Auto merge of #2179 - RalfJung:rustc, r=oli-obk
test ui output also in rustc test suite
`@oli-obk` when I just tried this locally (`./x.py test src/tools/miri --stage 0`), it worked fine. What differences had you seen before?
bors [Mon, 13 Jun 2022 10:23:42 +0000 (10:23 +0000)]
Auto merge of #2203 - RalfJung:deprecate, r=oli-obk
deprecate -Zmiri-allow-uninit-numbers and -Zmiri-allow-ptr-int-transmute
Cc https://github.com/rust-lang/miri/issues/2187 https://github.com/rust-lang/miri/issues/2188
Oli Scherer [Mon, 13 Jun 2022 08:55:34 +0000 (08:55 +0000)]
Always show stderr on test failure.
bors [Mon, 13 Jun 2022 04:43:28 +0000 (04:43 +0000)]
Auto merge of #2230 - scottmcm:master, r=RalfJung
Add `#![feature(yeet_expr)]`
Hopefully enough for https://github.com/rust-lang/rust/issues/98036
Scott McMurray [Mon, 13 Jun 2022 00:55:41 +0000 (17:55 -0700)]
Add `#![feature(yeet_expr)]`
bors [Mon, 13 Jun 2022 01:06:22 +0000 (01:06 +0000)]
Auto merge of #2229 - DrMeepster:patch-1, r=RalfJung
Add cache location on windows to documentation
DrMeepster [Sun, 12 Jun 2022 19:10:13 +0000 (12:10 -0700)]
correct the path
bors [Sun, 12 Jun 2022 05:34:22 +0000 (05:34 +0000)]
Auto merge of #2195 - RalfJung:vtable-validation, r=RalfJung
test for Stacked Borrows error during vtable validation
Fixes https://github.com/rust-lang/miri/issues/2123
Needs https://github.com/rust-lang/rust/pull/97761
Ralf Jung [Sun, 12 Jun 2022 05:34:01 +0000 (22:34 -0700)]
bless
Ralf Jung [Sun, 12 Jun 2022 00:45:33 +0000 (17:45 -0700)]
tweak punctuation
Ralf Jung [Sun, 12 Jun 2022 00:42:53 +0000 (17:42 -0700)]
rustup
Ralf Jung [Sun, 5 Jun 2022 16:26:16 +0000 (12:26 -0400)]
rename ExperimentalUb → StackedBorrowsUb
Ralf Jung [Sun, 5 Jun 2022 16:25:46 +0000 (12:25 -0400)]
test for Stacked Borrows error during vtable validation
bors [Sun, 12 Jun 2022 00:08:38 +0000 (00:08 +0000)]
Auto merge of #2226 - InfRandomness:unix-helpers, r=RalfJung
Add unix helpers
This creates unix helper(s)
DrMeepster [Sat, 11 Jun 2022 23:41:32 +0000 (16:41 -0700)]
Add cache location on windows to documentation
Andy Wang [Sat, 11 Jun 2022 19:45:45 +0000 (20:45 +0100)]
Prevent futex_wait from reading outdated value
infrandomness [Sat, 11 Jun 2022 15:54:23 +0000 (17:54 +0200)]
Add `assert_target_os_is_unix` function
infrandomness [Sat, 11 Jun 2022 13:37:49 +0000 (15:37 +0200)]
Add target_os_is_unix helper