Skip to content

update Miri #113974

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 28 commits into from
Jul 23, 2023
Merged

update Miri #113974

merged 28 commits into from
Jul 23, 2023

Conversation

RalfJung
Copy link
Member

r? @ghost

The Miri Conjob Bot and others added 28 commits July 16, 2023 06:24
Preparing for merge from rustc
648d74a
Merge from rustc
2e4a190
@bors
Auto merge of rust-lang#2983 - rust-lang:rustup2023-07-16, r=oli-obk
be6b42f 
Automatic sync from rustc
@RalfJung
style checks: use latest rustc for cron job
8480847
@bors
Auto merge of rust-lang#2981 - RalfJung:style, r=RalfJung
0548274 
style checks: use latest rustc for cron job
@RalfJung
clarify that we do not prove soundness
d537a7a
@RalfJung
link to a definition of soundness
75da07b
@bors
Auto merge of rust-lang#2984 - RalfJung:soundness, r=RalfJung
bbabfdc 
clarify that we do not prove soundness

Cc rust-lang/miri#2982
Preparing for merge from rustc
7948f1a
Merge from rustc
0c27c2e
@RalfJung
make './miri toolchain' work even if we cannot write to rustup dir
f5aa313
@RalfJung
fix clippy warnings
6ba56ac
@RalfJung
ignore test on apple
7bee1c8
@bors
Auto merge of rust-lang#2986 - rust-lang:rustup-2023-07-18, r=RalfJung
f4754ed 
Automatic sync from rustc
Preparing for merge from rustc
dfb552e
Merge from rustc
7b5b87d
@bors
Auto merge of rust-lang#2987 - rust-lang:rustup-2023-07-20, r=oli-obk
e643e0d 
Automatic sync from rustc
@RalfJung
make full field retagging the default
245c52e
@RalfJung
SB: track whether a retag occurred nested inside a field
b8b92db
@RalfJung
ask people to reach out if we declare too much UB
3cdd292
@bors
Auto merge of rust-lang#2985 - RalfJung:retag-fields, r=saethlin
c0de313 
make full field retagging the default

The 'scalar' field retagging mode is clearly a hack -- it mirrors details of the codegen backend and how various structs are represented in LLVM. This means whether code has UB or not depends on surprising aspects, such as whether a struct has 2 or 3 (non-zero-sized) fields. Now that both hashbrown and scopeguard have released fixes to be compatible with field retagging, I think it is time to enable full field retagging by default.

`@saethlin` do you have an idea of how much fallout enabling full field retagging by default will cause? Do you have objections to enabling it by default?

Fixes rust-lang/miri#2528
Preparing for merge from rustc
6e3932e
Merge from rustc
bd1e4ee
fmt
32198e1
@bors
Auto merge of rust-lang#2988 - rust-lang:rustup-2023-07-22, r=oli-obk
16cddb3 
Automatic sync from rustc
@RalfJung
Preparing for merge from rustc
46ddf46
@RalfJung
Merge from rustc
8a3b746
@bors
Auto merge of rust-lang#2990 - RalfJung:rustup, r=RalfJung
0c9d1a3 
Rustup
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 23, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jul 23, 2023

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 23, 2023

📌 Commit 0c9d1a3 has been approved by RalfJung

It is now in the queue for this repository.

@bors 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 Jul 23, 2023
@bors
Copy link
Collaborator

bors commented Jul 23, 2023

⌛ Testing commit 0c9d1a3 with merge 2a4a8c8...

@bors
Copy link
Collaborator

bors commented Jul 23, 2023

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 2a4a8c8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 23, 2023
@bors bors merged commit 2a4a8c8 into rust-lang:master Jul 23, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 23, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2a4a8c8): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.4% [0.4%, 0.4%] 1
Regressions ❌
(secondary)		 0.4% [0.3%, 0.5%] 4
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.4% [0.4%, 0.4%] 1

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)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -5.7% [-5.7%, -5.7%] 1
Improvements ✅
(secondary)		 -4.6% [-4.6%, -4.6%] 1
All ❌✅ (primary) -5.7% [-5.7%, -5.7%] 1

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
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -11.6% [-12.8%, -10.9%] 6
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 649.684s -> 651.496s (0.28%)

@RalfJung RalfJung deleted the miri branch July 24, 2023 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.
4 participants
@RalfJung @rustbot @bors @rust-timer