Skip to content

Miri subtree update#121232

Merged
bors merged 56 commits into
rust-lang:masterfrom
RalfJung:miri
Feb 17, 2024
Merged

Miri subtree update#121232
bors merged 56 commits into
rust-lang:masterfrom
RalfJung:miri

Conversation

@RalfJung

Copy link
Copy Markdown
Member

r? @ghost

devnexen and others added 30 commits January 29, 2024 20:49
`mmap64` is like `mmap` but uses a 64-bit integer instead of `off_t` for
the offset parameter.
moving out sched_getaffinity interception from linux'shim, FreeBSD su…

…pporting it too.
Switch over to rustc's `tracing` crate instead of using our own `log` crate

disadvantage: to turn on debug/trace logging, you need a rustc built with it
advantage: sharing our logging scheme with rustc, so our logs get nested correctly.
Miri has used the `target/miri` subdirectory since 2021 to keep itself
separate from non-miri builds, so this should not be necessary.

See commit 6a18683

Since the items are no longer a sequence of steps to do in
order ("first, make sure that ..."), switch to an unordered list while
we're at it.

Closes rust-lang#3289
Stop recommending cargo clean in README

Miri has used the `target/miri` subdirectory since 2021 to keep itself separate from non-miri builds, so this should not be necessary.

See commit 6a18683

Since the items are no longer a sequence of steps to do in order ("first, make sure that ..."), switch to an unordered list while we're at it.

Closes rust-lang#3289
`mmap64` is only defined on Linux, so move the implementation
to Linux-specific code.
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 17, 2024
@rustbot

rustbot commented Feb 17, 2024

Copy link
Copy Markdown
Collaborator

The Miri subtree was changed

cc @rust-lang/miri

@rustbot

rustbot commented Feb 17, 2024

Copy link
Copy Markdown
Collaborator

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

@bors r+ p=1

@bors

bors commented Feb 17, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit fd5a84b 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 Feb 17, 2024
@bors

bors commented Feb 17, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit fd5a84b with merge eeeb021...

@bors

bors commented Feb 17, 2024

Copy link
Copy Markdown
Collaborator

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 17, 2024
@bors bors merged commit eeeb021 into rust-lang:master Feb 17, 2024
@rustbot rustbot added this to the 1.78.0 milestone Feb 17, 2024
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (eeeb021): 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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.0% [-3.0%, -3.0%] 1
All ❌✅ (primary) - - 0

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: 638.94s -> 638.332s (-0.10%)
Artifact size: 306.36 MiB -> 306.33 MiB (-0.01%)

@RalfJung RalfJung deleted the miri branch February 18, 2024 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

9 participants