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 #137594

Merged
merged 75 commits into from
Feb 26, 2025
Merged

Miri subtree update #137594

merged 75 commits into from
Feb 26, 2025

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Feb 25, 2025 •
edited
Loading

r? @ghost

try-job: x86_64-gnu-aux

The Miri Cronjob Bot and others added 30 commits February 3, 2025 04:55
Preparing for merge from rustc
3f57fc1
Merge from rustc
45c3b3d
@oli-obk
Merge pull request rust-lang#4175 from rust-lang/rustup-2025-02-03
6e94718 
Automatic Rustup
Preparing for merge from rustc
9a858fa
Merge from rustc
cf4be3f
@RalfJung
update JSON target spec to declare softfloat ABI
8f1c4a3
@RalfJung
Merge pull request rust-lang#4176 from rust-lang/rustup-2025-02-04
4d78916 
Automatic Rustup
@RalfJung
Merge pull request rust-lang#4177 from psumbera/solaris-no-flock
a2d4f7f 
Use fcntl locking on Solaris instead of flock which is missing there.
@RalfJung
Preparing for merge from rustc
6b969d7
@RalfJung
Merge from rustc
7f95fa4
@RalfJung
bump default max parallelism up to 20
e58e3d5
@psumbera
Fix build on Solaris where is no flock().
9673d8d
@RalfJung
use cfg_match
a058e1a
@RalfJung
Merge pull request rust-lang#4178 from RalfJung/rustup
abe6846 
Rustup
@rayslava
allow code to call geteuid()
2d7f2ff
Preparing for merge from rustc
eb41458
Merge from rustc
7afb845
@oli-obk
Merge pull request rust-lang#4180 from rust-lang/rustup-2025-02-06
8f11cc0 
Automatic Rustup
@RalfJung
Merge pull request rust-lang#4179 from rayslava/master
fd11306 
allow code to call geteuid()
@tiif
Throw ub error when invoking non-vararg shim with vararg import
046451d
@RalfJung
inline a once-used function
550d217
@RalfJung
some more argument checking cleanup
af04c0d
@RalfJung
Merge pull request rust-lang#4181 from tiif/check_shim_variadic
0193a5a 
Throw ub error when invoking non-vararg shim with vararg import
Preparing for merge from rustc
89fd6d0
Merge from rustc
1194ad9
fmt
1a6fece
@RalfJung
Merge pull request rust-lang#4182 from rust-lang/rustup-2025-02-07
66c54d9 
Automatic Rustup
Preparing for merge from rustc
2a60a25
Merge from rustc
510e844
@saethlin
Merge pull request rust-lang#4184 from rust-lang/rustup-2025-02-08
f22fd36 
Automatic Rustup
@bors
Copy link
Contributor

bors commented Feb 25, 2025

⌛ Testing commit 5e4c582 with merge ca04cf6...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 25, 2025
@bors
Auto merge of rust-lang#137594 - RalfJung:miri-sync, r=RalfJung
ca04cf6 
Miri subtree update

r? `@ghost`
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Feb 25, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 25, 2025
@RalfJung RalfJung mentioned this pull request Feb 25, 2025
Closed
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Feb 25, 2025
@RalfJung
Copy link
Member Author

I've disabled float non-determinism for now while we evaluate the situation (see rust-lang/miri#4208, rust-lang/miri#4207).

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Feb 25, 2025

📌 Commit 716dd22 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 25, 2025
@bors
Copy link
Contributor

bors commented Feb 25, 2025

⌛ Testing commit 716dd22 with merge cb06d12...

@bors
Copy link
Contributor

bors commented Feb 26, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 26, 2025
@bors bors merged commit cb06d12 into rust-lang:master Feb 26, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 26, 2025
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cb06d12): 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 (secondary 1.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)		 1.6% [1.6%, 1.6%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
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: 770.518s -> 771.258s (0.10%)
Artifact size: 362.00 MiB -> 361.98 MiB (-0.01%)

@RalfJung RalfJung deleted the miri-sync branch February 26, 2025 06:46
@RalfJung
Copy link
Member Author

@Kobzol this finally syncs the CI changes you made :)

@Kobzol
Copy link
Contributor

Kobzol commented Feb 26, 2025

This PR accidentally merged the change from #137593 (found by @klensy https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/LLVM.20upgrades.20broken.20again/near/502005723).

@klensy klensy mentioned this pull request Feb 26, 2025
Open
@RalfJung
Copy link
Member Author

Oh damn, sorry for that. I can send a revert if you want?

@Kobzol
Copy link
Contributor

Kobzol commented Feb 26, 2025 •
edited
Loading

Even though that PR was already approved, the change potentially causes some issues (https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/LLVM.20upgrades.20broken.20again) so maybe it would be better to revert first and investigate, yeah.

@RalfJung RalfJung mentioned this pull request Feb 26, 2025
Merged
fmease added a commit to fmease/rust that referenced this pull request Feb 26, 2025
@fmease
Rollup merge of rust-lang#137670 - RalfJung:llvm-commit-logic-revert,…
585953a 
… r=Kobzol

revert accidental change in get_closest_merge_commit

This was accidentally merged as part of rust-lang#137594. I need this local diff to be able to debug miri syncs, and then typed `git commit -a` too fast and didn't realize it includes this change... sorry for that.

r? `@Kobzol`
fmease added a commit to fmease/rust that referenced this pull request Feb 26, 2025
@fmease
Rollup merge of rust-lang#137670 - RalfJung:llvm-commit-logic-revert,…
526dd27 
… r=Kobzol

revert accidental change in get_closest_merge_commit

This was accidentally merged as part of rust-lang#137594. I need this local diff to be able to debug miri syncs, and then typed `git commit -a` too fast and didn't realize it includes this change... sorry for that.

r? ``@Kobzol``
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 26, 2025
@rust-timer
Unrolled build for rust-lang#137670
d582427 
Rollup merge of rust-lang#137670 - RalfJung:llvm-commit-logic-revert, r=Kobzol

revert accidental change in get_closest_merge_commit

This was accidentally merged as part of rust-lang#137594. I need this local diff to be able to debug miri syncs, and then typed `git commit -a` too fast and didn't realize it includes this change... sorry for that.

r? ``@Kobzol``
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Feb 27, 2025
@fmease
Rollup merge of #137670 - RalfJung:llvm-commit-logic-revert, r=Kobzol
df0d5f4 
revert accidental change in get_closest_merge_commit

This was accidentally merged as part of rust-lang/rust#137594. I need this local diff to be able to debug miri syncs, and then typed `git commit -a` too fast and didn't realize it includes this change... sorry for that.

r? ``@Kobzol``
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) T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.87.0
Development

Successfully merging this pull request may close these issues.