Skip to content
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

update Miri #111454

Merged
merged 42 commits into from
May 11, 2023
Merged

update Miri #111454

merged 42 commits into from
May 11, 2023

Conversation

RalfJung
Copy link
Member

r? @ghost

bors and others added 30 commits April 30, 2023 20:41
@bors
Auto merge of rust-lang#2864 - RalfJung:rustup, r=RalfJung
e285f76 
Rustup

My previous rustup PR was broken. I didn't realize that "nothing to commit, working tree clean" meant "I didn't actually do the full pull properly, stop and inspect manually"...
@RalfJung
Preparing for merge from rustc
d20fa00
@RalfJung
Merge from rustc
3942cdf
@bors
Auto merge of rust-lang#2868 - RalfJung:rustup, r=RalfJung
12fd42a 
Rustup
@oli-obk
Avoid interpreting code that has lint errors
e0114e7
@bors
Auto merge of rust-lang#2869 - oli-obk:only_interp_compiling_code, r=…
9db11c9 
…RalfJung

Avoid interpreting code that has lint errors

fixes rust-lang#2608

we previously only checked for actual errors, as deny lints are handled differently.
@RalfJung
Preparing for merge from rustc
59477cc
@RalfJung
Merge from rustc
3951a02
@bors
Auto merge of rust-lang#2871 - RalfJung:rustup, r=RalfJung
cfd7eaa 
Rustup
@RalfJung
Preparing for merge from rustc
9ce6cfb
@RalfJung
Merge from rustc
4062fe2
@RalfJung
ensure that the proc_macro crate exists in the sysroot
8ab4803
@RalfJung
update dependencies
f5fa50f
@bors
Auto merge of rust-lang#2875 - RalfJung:rustup, r=RalfJung
42b14dc 
Rustup

This *should* fail because of rust-lang/miri#2874 but it seems we don't actually cover that in our tests...
@RalfJung
clearer variable names in data_race
fd30862
@bors
Auto merge of rust-lang#2876 - RalfJung:varnames, r=RalfJung
457a7a8 
clearer variable names in data_race
@Vanille-N @RalfJung
Simplify Tree Borrows event filtering by getting the Range from RangeMap
0677cd0 
Co-authored-by: Ralf Jung <[email protected]>
@bors
Auto merge of rust-lang#2867 - Vanille-N:tb-diags, r=RalfJung
dd9df18 
Simplify event selection in TB diagnostics

As discussed previously, getting the range from `RangeMap` can make the filtering of events much simpler without any user-visible diff.

See minor exception in [<9d8fc00>](rust-lang/miri@9d8fc00) and decide how to resolve it
- add a boolean flag not to record events produced by deallocations ?
- add a `help: deallocation counts as an implicit write` ? (Note: could be generalized to also include `help: reborrow counts as an implicit read`)
- not bother and keep as-is ?
- something else ?
@RalfJung
Preparing for merge from rustc
ce3a2e5
@RalfJung
Merge from rustc
e476f7a
@bors
Auto merge of rust-lang#2878 - RalfJung:rustup, r=RalfJung
3d5a516 
Rustup
@RalfJung
increase timing slack for sync tests
1db8540
@RalfJung
print how long the measured sleep time actually was on test failure
64d4fd5
@RalfJung
port tests to 2021 edition
3309f12
@bors
Auto merge of rust-lang#2880 - RalfJung:sync, r=RalfJung
a477b81 
increase timing slack for sync tests; port tests to 2021 edition
@oli-obk
Update to latest ui_test crate version.
37c3af4 
Also stops using github actions groups that conflict with our groups as github does not nest them
@oli-obk
Separate config building from Miri command building
44e86e7
@oli-obk
Document some arguments
f321c8d
@bors
Auto merge of rust-lang#2884 - oli-obk:ui_test, r=RalfJung,oli-obk
84f80f1 
Update to latest ui_test crate version.

Also stops using github actions groups that conflict with our groups as github does not nest them
@Vanille-N @RalfJung
Thorough merge after GC
1a4690d 
including accurate eq impl for UniMap

Co-authored-by: Ralf Jung <[email protected]>
@bors
Copy link
Contributor

bors commented May 11, 2023

🌲 The tree is currently closed for pull requests below priority 50. This pull request will be tested once the tree is reopened.

@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 May 11, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 11, 2023

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
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented May 11, 2023

📌 Commit 2c88ee8 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented May 11, 2023

🌲 The tree is currently closed for pull requests below priority 50. This pull request will be tested once the tree is reopened.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@workingjubilee
Copy link
Member

still failing?
@bors r-

@bors 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 May 11, 2023
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label May 11, 2023
@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented May 11, 2023

📌 Commit b0b76a5 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 11, 2023
@bors
Copy link
Contributor

bors commented May 11, 2023

⌛ Testing commit b0b76a5 with merge 2a8221d...

@bors
Copy link
Contributor

bors commented May 11, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 11, 2023
@bors bors merged commit 2a8221d into rust-lang:master May 11, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 11, 2023
This was referenced May 11, 2023
Merged
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2a8221d): 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)

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

Cycles

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

Binary size

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

Bootstrap: 659.801s -> 659.726s (-0.01%)

@RalfJung RalfJung deleted the miri branch May 12, 2023 12:52
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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.
9 participants
@RalfJung @rustbot @bors @rust-log-analyzer @workingjubilee @rust-timer @oli-obk @Vanille-N @saethlin