update Miri #113151

RalfJung · 2023-06-29T07:29:46Z

- reorganize tests/ structure: {stacked,tree,both}_borrows - UnsafeCell transmutation (the one that should fail, i.e. transmute & -> UnsafeCell then try to write) - select TB pass tests from existing SB fail tests (and a version that fails TB) - many fail tests now shared * extra test for TB that parent write invalidates child reads * buggy_* tests now shared * tests for deep retagging (pass_invalid_shr_*) now shared * extra TB test that shared references are read-only * aliasing_mut{1,2,3,4} adapted to fail both * extra TB test that write to raw parent invalidates shared children * mut_exclusive_violation2 now shared * issue-miri-1050-2 revisions fix - deduplications

TB: more fail tests (mostly shared with SB) Although it was not in the tests, `mem::transmute` works for `UnsafeCell -> &` as well. Draft: will also introduce more test cases for cases that fail. Draft: depends on the new error messages from rust-lang#2888

use as_os_str_bytes Make use of the new operations recently added (tracking issue: rust-lang#111544). At least the "host OsStr to target bytes" direction now works even for non-utf-8 strings on all hosts!

Remove rustc-workspace-hack The `rustc-workspace-hack` dependency was removed in rust-lang#109133 and should no longer be needed.

TB: improve error messages (distinguish between accesses and reborrows) I don't remember where, but there was a complaint that while SB's error messages distinguish between "invalidated by an access" and "invalidated by a reborrow", TB's error messages do not.

Also punctuation

Revert error in doc comment Also punctuation

TB: `box_exclusive_violation1` moved to `both_borrows` `box_noalias_violation` was already shared, it makes sense to test `box_exclusive_violation` with TB too.

Rustup

Dereference pointers in shims as correct types Currently, shims will dereference pointers as the type written by the user. This can cause false positives, incorrect behavior such as rust-lang#2136, and even ICEs if a field is not present. This PR fixes this by having shims dereference pointers with types from `std` or `libc` that we can rely on the layout and field names of instead of with whatever the user passed in. Fixes rust-lang#1123

Rustup

add tests for panicky drop in thread_local destructor Adds a test for rust-lang#112285

comment tweaks

rustbot · 2023-06-29T07:29:50Z

The Miri subtree was changed

cc @rust-lang/miri

rustbot · 2023-06-29T07:31:55Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

RalfJung · 2023-06-29T07:32:21Z

@bors r p=1

bors · 2023-06-29T07:32:23Z

📌 Commit a3cea7f has been approved by RalfJung

It is now in the queue for this repository.

oli-obk · 2023-06-29T07:51:56Z

@bors r-

tests are failing due to

error: failed to find or create the directory specified by --out-dir

that's a ui_test failure, huh. I'll check what's up

oli-obk · 2023-06-29T07:58:12Z

download-ci-llvm is broken... this is gonna take a bit

RalfJung · 2023-06-29T08:00:35Z

Probably you are hitting #101907; see here for a work-around.

RalfJung · 2023-06-29T10:20:32Z

src/tools/miri/tests/compiletest.rs

@@ -88,6 88,7 @@ fn test_config(target: &str, path: &str, mode: Mode, with_dependencies: bool) ->
 mode,
 program,
 output_conflict_handling,
+ out_dir: std::env::var_os("CARGO_TARGET_DIR").unwrap().into(),


Will this put random files into the out_dir? Maybe it should be a miri subdir of that folder, or so.

Why does this work in Miri CI, is there some kind of default?

yea there's a default. I need to fix this in ui_test specifically (should always append ui or sth)

oli-obk · 2023-06-29T10:44:16Z

@bors r=RalfJung,oli-obk

bors · 2023-06-29T10:44:17Z

📌 Commit 78f58f9 has been approved by RalfJung,oli-obk

It is now in the queue for this repository.

bors · 2023-06-29T10:55:43Z

⌛ Testing commit 78f58f9 with merge e69c730...

bors · 2023-06-29T13:40:24Z

☀️ Test successful - checks-actions
Approved by: RalfJung,oli-obk
Pushing e69c730 to master...

rust-timer · 2023-06-29T16:11:14Z

Finished benchmarking commit (e69c730): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.1%	[0.4%, 2.1%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.9%	[-5.3%, -0.4%]	7
Improvements ✅ (secondary)	-4.0%	[-4.0%, -4.0%]	1
All ❌✅ (primary)	-1.0%	[-5.3%, 2.1%]	10

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.7%	[0.7%, 0.7%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.7%	[0.7%, 0.7%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 661.411s -> 662.766s (0.20%)

beepster4096 and others added 30 commits June 2, 2023 15:34

deref shim arguments with actual ty instead of declared ty

13c20f2

add deref_pointer_as

9d1d651

explain windows sync layouts

7380a4d

use as_os_str_bytes

7444a50

Auto merge of rust-lang#2915 - RalfJung:as_os_str_bytes, r=RalfJung

c1a7783

use as_os_str_bytes Make use of the new operations recently added (tracking issue: rust-lang#111544). At least the "host OsStr to target bytes" direction now works even for non-utf-8 strings on all hosts!

Remove rustc-workspace-hack

53187d7

Auto merge of rust-lang#2916 - ehuss:remove-workspace-hack, r=RalfJung

5d01a6b

Remove rustc-workspace-hack The `rustc-workspace-hack` dependency was removed in rust-lang#109133 and should no longer be needed.

Differentiate between explicit accesses and accesses inserted by TB

7a1cdf7

Revert error in doc comment

c87f6d9

Also punctuation

Auto merge of rust-lang#2919 - Vanille-N:tb-diags, r=RalfJung

634c21f

Revert error in doc comment Also punctuation

box_exclusive_violation

be5f6b2

Auto merge of rust-lang#2922 - Vanille-N:tb-tests, r=RalfJung

85533a3

TB: `box_exclusive_violation1` moved to `both_borrows` `box_noalias_violation` was already shared, it makes sense to test `box_exclusive_violation` with TB too.

Preparing for merge from rustc

6147833

Merge from rustc

6ab7af4

Auto merge of rust-lang#2924 - RalfJung:rustup, r=RalfJung

15a6362

Rustup

Preparing for merge from rustc

36e0c42

Merge from rustc

24595f5

Auto merge of rust-lang#2928 - oli-obk:rustup, r=oli-obk

52036f5

Rustup

Preparing for merge from rustc

8e930fd

Merge from rustc

508675b

Auto merge of rust-lang#2930 - RalfJung:rustup, r=RalfJung

c853744

Rustup

add tests for panicky drop in thread_local destructor

e2d2266

make test work cross-platform

f3b52fd

Auto merge of rust-lang#2929 - RalfJung:tls-panic, r=RalfJung

6f771c8

add tests for panicky drop in thread_local destructor Adds a test for rust-lang#112285

comment tweaks

5c9ad8b

Auto merge of rust-lang#2932 - RalfJung:comment, r=RalfJung

20a2a24

comment tweaks

update lockfile

a3cea7f

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 29, 2023

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 29, 2023

RalfJung commented Jun 29, 2023

View reviewed changes

Use a valid target directory in miri ui tests

78f58f9

oli-obk force-pushed the miri branch from e410481 to 78f58f9 Compare June 29, 2023 10:44

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 29, 2023

oli-obk mentioned this pull request Jun 29, 2023

Prefer the CARGO_TARGET_DIR env var over the local directory. oli-obk/ui_test#91

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 29, 2023

bors merged commit e69c730 into rust-lang:master Jun 29, 2023
12 checks passed

rustbot added this to the 1.72.0 milestone Jun 29, 2023

This was referenced Jun 29, 2023

unused_parens now fires on cast expression #110189

Closed

Improve invalid_reference_casting lint #112431

Merged

(re-)tighten sourceinfo span of adjustments in MIR #112945

Merged

RalfJung deleted the miri branch July 3, 2023 11:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update Miri #113151

update Miri #113151

RalfJung commented Jun 29, 2023

rustbot commented Jun 29, 2023

rustbot commented Jun 29, 2023

RalfJung commented Jun 29, 2023

bors commented Jun 29, 2023

oli-obk commented Jun 29, 2023

oli-obk commented Jun 29, 2023

RalfJung commented Jun 29, 2023

RalfJung Jun 29, 2023

oli-obk Jun 29, 2023

oli-obk commented Jun 29, 2023

bors commented Jun 29, 2023

bors commented Jun 29, 2023

bors commented Jun 29, 2023

rust-timer commented Jun 29, 2023

update Miri #113151

update Miri #113151

Conversation

RalfJung commented Jun 29, 2023

rustbot commented Jun 29, 2023

rustbot commented Jun 29, 2023

RalfJung commented Jun 29, 2023

bors commented Jun 29, 2023

oli-obk commented Jun 29, 2023

oli-obk commented Jun 29, 2023

RalfJung commented Jun 29, 2023

RalfJung Jun 29, 2023

Choose a reason for hiding this comment

oli-obk Jun 29, 2023

Choose a reason for hiding this comment

oli-obk commented Jun 29, 2023

bors commented Jun 29, 2023

bors commented Jun 29, 2023

bors commented Jun 29, 2023

rust-timer commented Jun 29, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size