Skip to content

Miri subtree update #143137

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
Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open

Miri subtree update #143137

wants to merge 40 commits into from

Conversation

RalfJung
Copy link
Member

r? @ghost

The Miri Cronjob Bot and others added 30 commits June 17, 2025 04:55
Preparing for merge from rustc
de213b9
Merge from rustc
fdc01cf
@RalfJung
Merge pull request rust-lang#4402 from rust-lang/rustup-2025-06-17
7dfa752 
Automatic Rustup
Preparing for merge from rustc
fc7480a
Merge from rustc
140479d
@RalfJung
Merge pull request rust-lang#4404 from rust-lang/rustup-2025-06-18
e8fccab 
Automatic Rustup
@nia-e
minimal ptrace setup
2701dbb 
Apply suggestions from code review

Co-authored-by: Oli Scherer <github35764891676564198441@oli-obk.de>

review comments

fix possible hang
@oli-obk
Merge pull request rust-lang#4401 from nia-e/barebones-ptrace
e857c65 
trace: add barebones ptrace setup
Preparing for merge from rustc
19c6f75
Merge from rustc
e943342
@RalfJung
Merge pull request rust-lang#4407 from rust-lang/rustup-2025-06-19
c35c60d 
Automatic Rustup
@Stypox
Allow building Miri with --features from miri-script
a009612 
Otherwise there was no way to pass e.g. `--features tracing` just to the `cargo` commands issued on the root repository:
CARGO_EXTRA_FLAGS applies the flags to the "cargo-miri" crate, too, which does not make sense for crate-specific features.

Fix install_to_sysroot doing path concatenation twice. Since the second concatenation was against an absolute path, it didn't do anything. This also makes the interface of install_to_sysroot() similar to that of cargo_cmd().

Implement --features for clippy, also fix not passing features to one of the cargo invocations for test
@RalfJung
Merge pull request rust-lang#4396 from Stypox/build-with-features
487feb9 
Allow building Miri with --features from miri-script
@nia-e @RalfJung
isolated_alloc: directly use mmap for allocations
a9cc316 
Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <post@ralfj.de>

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <post@ralfj.de>

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <post@ralfj.de>

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <post@ralfj.de>

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <post@ralfj.de>

address review

Apply suggestions from code review

Co-authored-by: Ralf Jung <post@ralfj.de>

fix comment

fix position thing

dumb mistake

Apply suggestions from code review

Co-authored-by: Ralf Jung <post@ralfj.de>
@RalfJung
Merge pull request rust-lang#4362 from nia-e/fix-alloc-perf
9eee9ee 
isolated_alloc: directly use mmap for allocations
Preparing for merge from rustc
422cd5d
Merge from rustc
fd7fb5e
@RalfJung
Merge pull request rust-lang#4409 from rust-lang/rustup-2025-06-20
c461e50 
Automatic Rustup
@nia-e
supervisor bits of ffi ptracing
fdc2d52
@nia-e
fix dumb mistake
d20f3a8
@nia-e
cfg if
6a0976a
@nia-e
nonnulls
a536d89
@nia-e
error rework
d59518d
@nia-e @oli-obk
Update src/shims/trace/parent.rs
02df2b1 
Co-authored-by: Oli Scherer <github35764891676564198441@oli-obk.de>
@nia-e
fmt
733284f
@oli-obk
Merge pull request rust-lang#4405 from nia-e/standalone-ptrace
7f0dbba 
trace: implement supervisor components for tracing
@Patrick-6
Delay writing of return value of a join until after the join is succe…
bfa933a 
…ssful.
@RalfJung
Merge pull request rust-lang#4408 from Patrick-6/rework-thread-join
0390197 
Only write join return value once join succeeds
Preparing for merge from rustc
34949e3
Merge from rustc
3d8d4d4
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 28, 2025
@matthiaskrgr
Rollup merge of rust-lang#143137 - RalfJung:miri-sync, r=RalfJung
a1ceeec 
Miri subtree update

r? `@ghost`
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 28, 2025
Closed
bors added a commit that referenced this pull request Jun 28, 2025
@bors
Auto merge of #143148 - matthiaskrgr:rollup-xlijz8h, r=matthiaskrgr
fa50220 
Rollup of 10 pull requests

Successful merges:

 - #123476 (std::net: adding `unix_socket_exclbind` feature for solaris/illumos.)
 - #142708 (Do not include NUL-terminator in computed length)
 - #142963 (Skip unnecessary components in x64 try builds)
 - #142987 (rustdoc: show attributes on enum variants)
 - #143031 (Add windows-gnullvm hosts to the manifest)
 - #143082 (update internal `send_signal` comment)
 - #143110 (Use tidy to sort `sym::*` items)
 - #143111 (BTreeSet: remove duplicated code by reusing `from_sorted_iter`)
 - #143114 (Minor Documentation Improvements)
 - #143137 (Miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Jun 28, 2025

⌛ Testing commit 8d7f053 with merge ed6594e...

bors added a commit that referenced this pull request Jun 28, 2025
@bors
Auto merge of #143137 - RalfJung:miri-sync, r=RalfJung
ed6594e 
Miri subtree update

r? `@ghost`
@matthiaskrgr
Copy link
Member

@bors retry r-
#143148 (comment)

@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 Jun 28, 2025
@RalfJung
Copy link
Member Author

@nia-e seems like the riscv code path doesn't actually work. I'll remove it for now.

@RalfJung
Copy link
Member Author

@bors2 try jobs=dist-riscv64-linux

@rust-bors
Copy link

rust-bors bot commented Jun 28, 2025

⌛ Trying commit 3b30fcb with merge 177446b…

To cancel the try build, run the command @bors2 try cancel.

rust-bors bot added a commit that referenced this pull request Jun 28, 2025
@rust-bors
Auto merge of #143137 - RalfJung:miri-sync, r=<try>
177446b 
Miri subtree update

r? `@ghost`
try-job: dist-riscv64-linux
@rust-bors
Copy link

rust-bors bot commented Jun 28, 2025

💔 Test failed

@RalfJung
Copy link
Member Author

@bors2 try jobs=dist-riscv64-linux

@rust-bors
Copy link

rust-bors bot commented Jun 28, 2025

⌛ Trying commit 47b1871 with merge 5c2b93b…

To cancel the try build, run the command @bors2 try cancel.

rust-bors bot added a commit that referenced this pull request Jun 28, 2025
@rust-bors
Auto merge of #143137 - RalfJung:miri-sync, r=<try>
5c2b93b 
Miri subtree update

r? `@ghost`
try-job: dist-riscv64-linux
@rust-bors
Copy link

rust-bors bot commented Jun 28, 2025

💔 Test failed

@RalfJung
Copy link
Member Author

I have no idea how that parent.rs file was ever meant to build for other architectures? It seems when the constants and ArchIndependentRegs impl is missing, it will just not build. That's not okay, we need a fallback that at least builds everywhere.

I'm going to disable most of the ptrace machinery to make the build work again -- I don't have the time to figure out how to actually fix the build here.

@RalfJung
Copy link
Member Author

@bors2 try jobs=dist-riscv64-linux

@rust-bors
Copy link

rust-bors bot commented Jun 29, 2025

⌛ Trying commit e562940 with merge ae3e477…

To cancel the try build, run the command @bors2 try cancel.

rust-bors bot added a commit that referenced this pull request Jun 29, 2025
@rust-bors
Auto merge of #143137 - RalfJung:miri-sync, r=<try>
ae3e477 
Miri subtree update

r? `@ghost`
try-job: dist-riscv64-linux
@rust-bors
Copy link

rust-bors bot commented Jun 29, 2025

☀️ Try build successful (CI)
Build commit: ae3e477 (ae3e477bbeef45de36d29a7ba1376e4dff375745, parent: 8141c2265f5f2b26d89abe8df5fa67286f2425d4)

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 29, 2025

📌 Commit e562940 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 Jun 29, 2025
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
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@RalfJung @rustbot @bors @rust-log-analyzer @matthiaskrgr @nia-e @oli-obk @Stypox @Patrick-6