Skip to content

Conversation

@RalfJung
Copy link
Member

Contains the fix for rust-lang/miri#4698, which we should get shipped ASAP.

Subtree update of miri to rust-lang/miri@0fea24a.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost

RalfJung and others added 19 commits November 16, 2025 13:42
epoll: use more idiomatic way to consume iterator
GenMC (v0.14.1) no longer depends on LLVM when built as a library.
This commit adjust genmc building and shim accordingly.
GenMC v0.14.1 does not throw an error internally if the config
is invalid, but rather returns an appropriate error value.
This commit has setup code in Miri check the returned value,
and exit if there are any errors.
The new error-reporting mechanism of GenMC changed its public API.
This commit adjusts the Miri interface accordingly (all driver
calls need an extra argument that represents possible debugging
information).
When GenMC says that an execution should not be explored further,
Miri needs to know why (e.g., so that it returns an appropriate
exit value). Until now, some (erroneous) heuristics were used
for that.

This commit changes the Miri/GenMC API to check the scheduling
result of GenMC (that now reflects the "stop type").
Now GenMC can be built as a standalone library, without
LLVM dependencies.
This updates the rust-version file to 69d4d5f.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 69d4d5f
Filtered ref: a26d495b52327d29e0d66ac3050932a98a0ad6bb
Upstream diff: rust-lang/rust@7a72c54...69d4d5f

This merge was created using https://github.com/rust-lang/josh-sync.
genmc: Build without LLVM; adjust to API changes
…ildcard-provenance

initial implementation of wildcard provenence for tree borrows
emit stashed diagnostics before flushing delayed errors
@rustbot
Copy link
Collaborator

rustbot commented Nov 17, 2025

The Miri subtree was changed

cc @rust-lang/miri

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 17, 2025
@rustbot
Copy link
Collaborator

rustbot commented Nov 17, 2025

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
Collaborator

bors commented Nov 17, 2025

📌 Commit eafd125 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 Nov 17, 2025
@bors
Copy link
Collaborator

bors commented Nov 17, 2025

⌛ Testing commit eafd125 with merge 42ebbd2...

@bors
Copy link
Collaborator

bors commented Nov 17, 2025

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 42ebbd2 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 17, 2025
@bors bors merged commit 42ebbd2 into rust-lang:main Nov 17, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 17, 2025
@github-actions
Copy link
Contributor

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 66bc5a4 (parent) -> 42ebbd2 (this PR)

Test differences

Show 2 test diffs

2 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 42ebbd2356acd4ddfb36163ab85bce9e9292a234 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. aarch64-gnu-debug: 4941.6s -> 4111.2s (-16.8%)
  2. dist-various-1: 4333.7s -> 3806.9s (-12.2%)
  3. x86_64-mingw-1: 10907.8s -> 9676.2s (-11.3%)
  4. dist-aarch64-apple: 7273.1s -> 6507.5s (-10.5%)
  5. aarch64-msvc-2: 5689.3s -> 5097.8s (-10.4%)
  6. x86_64-gnu-tools: 3280.8s -> 3621.2s (+10.4%)
  7. x86_64-gnu-distcheck: 6693.4s -> 7363.4s (+10.0%)
  8. dist-ohos-x86_64: 4410.8s -> 4057.6s (-8.0%)
  9. x86_64-gnu-llvm-21-3: 5706.8s -> 6146.6s (+7.7%)
  10. dist-apple-various: 3491.9s -> 3756.6s (+7.6%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@RalfJung RalfJung deleted the miri branch November 17, 2025 17:58
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (42ebbd2): 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

Results (secondary 3.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Binary size

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

Bootstrap: 473.832s -> 475.733s (0.40%)
Artifact size: 388.76 MiB -> 388.74 MiB (-0.00%)

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.

6 participants