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

Miri subtree update #128699

Merged
merged 39 commits into from
Aug 5, 2024
Merged

Miri subtree update #128699

merged 39 commits into from
Aug 5, 2024

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Aug 5, 2024

r? @ghost

newpavlov and others added 30 commits July 26, 2024 20:42
@newpavlov
Add flock shim
1507af4
@oli-obk
Make field private. It is not used outside the module and it should n…
051cc2d 
…ot be directly accessed anyway
@oli-obk
Split out actual FileDescriptor creation
724160a
@oli-obk
Rename FileDescriptor to FileDescriptionRef
4742a81
@oli-obk
Rename all file_descriptor variables to file_description to match…
b48e1b1 
… the naming scheme of the types
Preparing for merge from rustc
fc584d7
Merge from rustc
8f712b5
@bors
Auto merge of rust-lang#3773 - rust-lang:rustup-2024-07-30, r=oli-obk
a8b8a07 
Automatic Rustup
@bors
Auto merge of rust-lang#3759 - newpavlov:flock, r=oli-obk
37e7688 
Add `flock` shim
@bors
Auto merge of rust-lang#3770 - oli-obk:duplicator, r=oli-obk
cf63c16 
Some FileDescriptor/FileDescription refactorings

follow-up to rust-lang/miri#3763 (comment)

I opted not to change the method names, as I think they are already pretty good (and the common one is the short name), and the docs should explain what they actually do, but if you feel like the names you proposed would be better, I'll just do that.
@oli-obk
Use Scalar consistently in foreign item emulation
6fc1b69
@bors
Auto merge of rust-lang#3776 - oli-obk:duplicator, r=oli-obk
f1e8c54 
Use Scalar consistently in foreign item emulation

Step 0 of rust-lang#3772

This just makes the code consistent. While we could also go for consistency the other way, that would only allow us to use integers in some cases where we use `Scalar` right now, because `Scalar` can also hold pointers where applicable.

There's also no danger in messing up (even though we do lose some compile-time checks), as `Scalar` knows the size of the integer stored within, so it will check that against the destination when it is written. In fact, this makes the checks much stronger compared with `write_int`, which just checks that the integer fits into the destination size.
@RalfJung
FD: refactor API names a little
6283c4d
@RalfJung
FD table: rename dup to get_ref
6f48edf
@bors
Auto merge of rust-lang#3778 - RalfJung:fd, r=oli-obk
50d51fb 
FD: refactor API names a little

I feel like these two functions are different enough that their names should not indicate complete symmetry. I am not sure what the best names would be, though... `@oli-obk` any opinions?
@RalfJung
flock: a bit of cleanup
5af27e4
@bors
Auto merge of rust-lang#3781 - RalfJung:flock, r=RalfJung
769e900 
flock: a bit of cleanup

Follow-up to rust-lang/miri#3759
@RalfJung
when josh-proxy screws up the roundtrip, say what the involved commit…
9117546 
…s are
@bors
Auto merge of rust-lang#3782 - RalfJung:josh-roundtrip-error, r=RalfJung
9de5630 
when josh-proxy screws up the roundtrip, say what the involved commits are
Preparing for merge from rustc
7d7c4db
Merge from rustc
85ed3fe
fmt
fc260e1
@bors
Auto merge of rust-lang#3783 - rust-lang:rustup-2024-08-02, r=RalfJung
989b8f7 
Automatic Rustup
@primoly
Add miri_start support
c4b7417
@RalfJung
docs
6bb1197
@bors
Auto merge of rust-lang#3769 - primoly:miri-start, r=RalfJung
5852b24 
Add `miri_start` support

This PR uses a function with the exported symbol `miri_start` as a drop-in alternative to `#[start]`. So the signature stays the same as suggested in [this comment](rust-lang/miri#3498 (comment)). <del>I’ve also removed Miri’s restriction  to only work on bin crates as I don’t think this is necessary anymore.</del>

Closes rust-lang#3758
Preparing for merge from rustc
6aab319
Merge from rustc
62e2800
@bors
Auto merge of rust-lang#3785 - rust-lang:rustup-2024-08-03, r=RalfJung
47aea6f 
Automatic Rustup
@RalfJung
Preparing for merge from rustc
d280837
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2024
@rustbot
Copy link
Collaborator

rustbot commented Aug 5, 2024

The Miri subtree was changed

cc @rust-lang/miri

@rustbot
Copy link
Collaborator

rustbot commented Aug 5, 2024

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

RalfJung commented Aug 5, 2024

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Aug 5, 2024

📌 Commit f6edc8a 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 Aug 5, 2024
@RalfJung RalfJung mentioned this pull request Aug 5, 2024
Merged
@bors
Copy link
Contributor

bors commented Aug 5, 2024

⌛ Testing commit f6edc8a with merge e57f309...

@bors
Copy link
Contributor

bors commented Aug 5, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 5, 2024
@bors bors merged commit e57f309 into rust-lang:master Aug 5, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 5, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e57f309): 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 (primary -1.1%, secondary 3.6%)

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

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: 761.757s -> 760.451s (-0.17%)
Artifact size: 336.93 MiB -> 336.85 MiB (-0.02%)

@RalfJung RalfJung deleted the miri-sync branch August 6, 2024 08:12
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.82.0
Development

Successfully merging this pull request may close these issues.
7 participants
@RalfJung @rustbot @bors @rust-timer @newpavlov @oli-obk @primoly