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.

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

Merged
merged 40 commits into from
Jun 29, 2025
Merged

Miri subtree update #143137

merged 40 commits into from
Jun 29, 2025

Conversation

RalfJung
Copy link
Member

r? @ghost

The Miri Cronjob Bot and others added 30 commits June 17, 2025 04:55
Apply suggestions from code review

Co-authored-by: Oli Scherer <[email protected]>

review comments

fix possible hang
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
Allow building Miri with --features from miri-script
Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

address review

Apply suggestions from code review

Co-authored-by: Ralf Jung <[email protected]>

fix comment

fix position thing

dumb mistake

Apply suggestions from code review

Co-authored-by: Ralf Jung <[email protected]>
isolated_alloc: directly use mmap for allocations
trace: implement supervisor components for tracing
Only write join return value once join succeeds
@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
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
@bors
Copy link
Collaborator

bors commented Jun 29, 2025

⌛ Testing commit e562940 with merge fd58463...

bors added a commit that referenced this pull request Jun 29, 2025
Miri subtree update

r? `@ghost`
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
---- [run-make] tests\run-make\short-ice stdout ----

error: rmake recipe failed to complete
status: exit code: 101
command: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\test\\run-make\\short-ice\\rmake.exe"
stdout: none
--- stderr -------------------------------

thread 'main' panicked at D:\a\rust\rust\tests\run-make\short-ice\rmake.rs:38:5:
assertion `left == right` failed: Full backtrace should contain the short backtrace markers.
---
   2:     0x7ff894b867d1 - std::io::IoSlice::as_slice::hf2a00350d10a40c0
   3:     0x7ff894b920f5 - std::sys::backtrace::lock::hbd076de05a08e1d4
   4:     0x7ff894b98100 - std::panicking::default_hook::h33916e8f9241f0b7
   5:     0x7ff894b97e20 - std::panicking::default_hook::h33916e8f9241f0b7
   6:     0x7ff88b62d12e - RNvXss_NtCs8dwvfrnYlxw_5alloc5boxedINtB5_3BoxNCNvCs4pR428VrDlY_17rustc_driver_impl16install_ice_hooks_0EINtNtNtCslwDSaZFNwQA_4core3ops8function2FnTRDG0_IB1F_TRL1_INtNtCs44Tb3KzAySz_3std5panic13PanicHookInfoL0_EEEp6OutputuNtNtB1L_6marker4SyncNtB3z_4SendEL_R
   7:     0x7ff894b98e17 - std::panicking::rust_panic_with_hook::h60570dbbf03171bc
   8:     0x7ff894b98a22 - <std::panicking::begin_panic_handler::StaticStrPayload as core::panic::PanicPayload>::take_box::h89e55754fa525b96
   9:     0x7ff894b92c9f - std::sys::backtrace::__rust_end_short_backtrace::hfb7aee4e88135def
  10:     0x7ff894b985ae - __rustc[a2ab70e0d191f3e4]::rust_begin_unwind
  11:     0x7ff894eb8801 - core::panicking::panic_fmt::h3da96792c9261883
  12:     0x7ff89463b621 - <rustc_errors[de75045f364108a0]::DiagCtxtInner>::emit_diagnostic
  13:     0x7ff89463a2c9 - <rustc_errors[de75045f364108a0]::DiagCtxtInner>::emit_diagnostic
  14:     0x7ff88ba52f2d - RNvXs_NtNtNtCslwDSaZFNwQA_4core4iter8adapters6clonedINtB4_6ClonedINtNtB6_5chain5ChainIB12_IB12_IB12_IB12_IB12_IB12_IB12_IB12_IB12_IB12_IB12_IB12_IB12_INtNtNtB8_7sources5empty5EmptyRTReNtNtCshbQOAWku848_12rustc_target15target_features9StabilityRSB2U_EEINtNt
  15:     0x7ff8946391d8 - <rustc_errors[de75045f364108a0]::DiagCtxtInner>::emit_diagnostic
  16:     0x7ff8946374c1 - <rustc_errors[de75045f364108a0]::DiagCtxtHandle>::emit_diagnostic
  17:     0x7ff89469953c - <rustc_span[a77871936b0ee68]::ErrorGuaranteed as rustc_errors[de75045f364108a0]::diagnostic::EmissionGuarantee>::emit_producing_guarantee
  18:     0x7ff89030bad1 - <rustc_hir_typeck[6d20e2178e31fbb5]::fn_ctxt::FnCtxt>::check_repeat_exprs
  19:     0x7ff890304a99 - <rustc_hir_typeck[6d20e2178e31fbb5]::fn_ctxt::FnCtxt>::check_repeat_exprs
  20:     0x7ff8902b9340 - <rustc_hir_typeck[6d20e2178e31fbb5]::fn_ctxt::FnCtxt>::try_overloaded_call_traits
  21:     0x7ff8903ac3e7 - <rustc_hir_typeck[6d20e2178e31fbb5]::fn_ctxt::FnCtxt>::check_expr_kind
  22:     0x7ff8902d2dff - <rustc_hir_typeck[6d20e2178e31fbb5]::fn_ctxt::FnCtxt>::check_expr_coercible_to_type
  23:     0x7ff8903a0bae - <rustc_hir_typeck[6d20e2178e31fbb5]::fn_ctxt::FnCtxt>::check_expr_with_expectation
  24:     0x7ff89031301a - <rustc_hir_typeck[6d20e2178e31fbb5]::fn_ctxt::FnCtxt>::check_repeat_exprs
  25:     0x7ff8903a2703 - <rustc_hir_typeck[6d20e2178e31fbb5]::fn_ctxt::FnCtxt>::check_expr_kind
  26:     0x7ff8902d2dff - <rustc_hir_typeck[6d20e2178e31fbb5]::fn_ctxt::FnCtxt>::check_expr_coercible_to_type
  27:     0x7ff8903a0bae - <rustc_hir_typeck[6d20e2178e31fbb5]::fn_ctxt::FnCtxt>::check_expr_with_expectation
  28:     0x7ff8902d4e8f - <rustc_hir_typeck[6d20e2178e31fbb5]::fn_ctxt::FnCtxt>::check_return_or_body_tail
  29:     0x7ff8902111c1 - rustc_hir_typeck[6d20e2178e31fbb5]::check::check_fn
  30:     0x7ff890178312 - rustc_hir_typeck[6d20e2178e31fbb5]::upvar::should_do_rust_2021_incompatible_closure_captures_analysis
  31:     0x7ff892c39fc5 - rustc_query_impl[f65035c5825fc76]::plumbing::__rust_begin_short_backtrace::<rustc_query_impl[f65035c5825fc76]::query_impl::typeck::dynamic_query::{closure#2}::{closure#0}, rustc_middle[1160841ca6b9c3b]::query::erase::Erased<[u8; 8usize]>>
  32:     0x7ff892b7d647 - rustc_query_impl[f65035c5825fc76]::query_impl::anon_const_kind::get_query_incr::__rust_end_short_backtrace
  33:     0x7ff892a34ecb - RINvNtNtCskObJlfHqc7P_18rustc_query_system5query8plumbing17try_execute_queryINtCs1jWAAkO1Hhi_16rustc_query_impl13DynamicConfigINtNtCs6GXz0QJQbux_21rustc_data_structures9vec_cache8VecCacheNtNtCsTIkO8HJayW_10rustc_span6def_id10LocalDefIdINtNtNtCs5MqvJpnLTP_1
  34:     0x7ff892c6b28d - rustc_query_impl[f65035c5825fc76]::query_impl::typeck::get_query_non_incr::__rust_end_short_backtrace
  35:     0x7ff8908f3a69 - <u8 as <[_]>::to_vec_in::ConvertVec>::to_vec::<alloc[5fb8c00af2c371e4]::alloc::Global>
  36:     0x7ff8908e1665 - RINvNtNtCs6GXz0QJQbux_21rustc_data_structures4sync8parallel15par_for_each_inRNtNtCsTIkO8HJayW_10rustc_span6def_id10LocalDefIdRSB1d_NCINvMs1_NtNtCs5MqvJpnLTP_12rustc_middle3hir3mapNtNtNtB2i_2ty7context6TyCtxt19par_hir_body_ownersNCNvCsgZS5r16GcAv_18rustc_hi
  37:     0x7ff8906933f8 - rustc_hir_analysis[c5fc4c539d80be39]::check_crate
  38:     0x7ff88b9bea09 - rustc_interface[2a576fd17531f309]::passes::analysis
  39:     0x7ff892c3a5d3 - rustc_query_impl[f65035c5825fc76]::plumbing::__rust_begin_short_backtrace::<rustc_query_impl[f65035c5825fc76]::query_impl::analysis::dynamic_query::{closure#2}::{closure#0}, rustc_middle[1160841ca6b9c3b]::query::erase::Erased<[u8; 0usize]>>
  40:     0x7ff892b7e4e4 - rustc_query_impl[f65035c5825fc76]::query_impl::anon_const_kind::get_query_incr::__rust_end_short_backtrace
  41:     0x7ff89297c8f4 - RINvNtNtCskObJlfHqc7P_18rustc_query_system5query8plumbing17try_execute_queryINtCs1jWAAkO1Hhi_16rustc_query_impl13DynamicConfigINtNtB4_6caches11SingleCacheINtNtNtCs5MqvJpnLTP_12rustc_middle5query5erase6ErasedAhj0_EEKb0_KB3r_KB3r_ENtNtB1f_8plumbing9QueryCtxt
  42:     0x7ff8928ae24e - rustc_query_impl[f65035c5825fc76]::query_impl::analysis::get_query_non_incr::__rust_end_short_backtrace
  43:     0x7ff88b674290 - RINvMs2_NtNtCs44Tb3KzAySz_3std6thread5localINtB6_8LocalKeyINtNtCslwDSaZFNwQA_4core4cell4CellPuEE4withNCINvNtNtNtCs5MqvJpnLTP_12rustc_middle2ty7context3tls13enter_contextNCINvMsj_B1I_NtB1I_10GlobalCtxt5enterNCNCINvNtCs3DnKxWTplJB_15rustc_interface6passes28c
  44:     0x7ff88b6f2dda - RINvMsn_NtNtCs5MqvJpnLTP_12rustc_middle2ty7contextNtB6_6TyCtxt18create_global_ctxtINtNtCslwDSaZFNwQA_4core6option6OptionNtNtCs3DnKxWTplJB_15rustc_interface7queries6LinkerENCNCINvNtB1Y_6passes28create_and_enter_global_ctxtB1i_NCNCNvCs4pR428VrDlY_17rustc_dri
  45:     0x7ff88b73ce5f - RINvNtNtNtNtCslwDSaZFNwQA_4core5slice4sort6stable5drift4sortTReINtNtCs8dwvfrnYlxw_5alloc3vec3VecNtCs3zk6zBQNtCM_15rustc_lint_defs6LintIdEENCINvMNtB14_5sliceSBW_11sort_by_keyBX_NCNvNvCs4pR428VrDlY_17rustc_driver_impl14describe_lints16sort_lint_groupss_0E0EB
  46:     0x7ff88b62cda7 - RNvXsq_NtCs8dwvfrnYlxw_5alloc5boxedINtB5_3BoxDG_INtNtNtCslwDSaZFNwQA_4core3ops8function6FnOnceTRL0_NtNtCs4K0Vwkch9wV_13rustc_session7session7SessionNtNtNtCs5MqvJpnLTP_12rustc_middle2ty7context10CurrentGcxINtNtB7_4sync3ArcNtNtCs6GXz0QJQbux_21rustc_data_stru
  47:     0x7ff88b7234fc - rustc_interface[2a576fd17531f309]::passes::create_and_enter_global_ctxt::<core[fabb8409faebf826]::option::Option<rustc_interface[2a576fd17531f309]::queries::Linker>, rustc_driver_impl[3372a8a2eb278b28]::run_compiler::{closure#0}::{closure#2}>
  48:     0x7ff88b6cb40e - RINvMs_CsdE6PBnUE6RH_10scoped_tlsINtB5_9ScopedKeyNtCsTIkO8HJayW_10rustc_span14SessionGlobalsE3setNCNCNCINvNtCs3DnKxWTplJB_15rustc_interface4util26run_in_thread_with_globalsNCINvB1G_31run_in_thread_pool_with_globalsNCINvNtB1I_9interface12run_compileruNCNvCs
  49:     0x7ff88b6ea9db - RINvNtNtCs44Tb3KzAySz_3std3sys9backtrace28___rust_begin_short_backtraceNCNCINvNtCs3DnKxWTplJB_15rustc_interface4util26run_in_thread_with_globalsNCINvB1e_31run_in_thread_pool_with_globalsNCINvNtB1g_9interface12run_compileruNCNvCs4pR428VrDlY_17rustc_driver_i
  50:     0x7ff88b6ebdea - <std[2f8256383ce76d51]::path::PathBuf as core[fabb8409faebf826]::hash::Hash>::hash::<rustc_stable_hash[dd237e182b666481]::stable_hasher::StableHasher<rustc_stable_hash[dd237e182b666481]::sip128::SipHasher128>>
  51:     0x7ff894b9e5c8 - std::sys::pal::windows::thread::Thread::new::h3b48a11d56a87b71
  52:     0x7ff8e5c0e8d7 - BaseThreadInitThunk
  53:     0x7ff8e6b7c34c - RtlUserThreadStart

error: the compiler unexpectedly panicked. this is a bug.
---

note: compiler flags: -Z treat-err-as-bug=1

query stack during panic:
#0 [typeck] type-checking `main`
#1 [analysis] running analysis passes on this crate
end of query stack

  left: 3
 right: 5
---
test result: FAILED. 311 passed; 1 failed; 86 ignored; 0 measured; 6 filtered out; finished in 235.76s

Some tests failed in compiletest suite=run-make mode=run-make host=x86_64-pc-windows-msvc target=x86_64-pc-windows-msvc
Build completed unsuccessfully in 2:25:35
make: *** [Makefile:112: ci-msvc-py] Error 1
  local time: Sun Jun 29 13:00:21 CUT 2025
  network time: Sun, 29 Jun 2025 13:00:21 GMT
##[error]Process completed with exit code 2.
Post job cleanup.
[command]"C:\Program Files\Git\bin\git.exe" version

@bors
Copy link
Collaborator

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

@bors retry tests\run-make\short-ice spurious failure

@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 Jun 29, 2025
@bors
Copy link
Collaborator

bors commented Jun 29, 2025

⌛ Testing commit e562940 with merge ed2d759...

@bors
Copy link
Collaborator

bors commented Jun 29, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 29, 2025
@bors bors merged commit ed2d759 into rust-lang:master Jun 29, 2025
11 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jun 29, 2025
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 5e749eb (parent) -> ed2d759 (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard ed2d759783dc9de134bbb3f01085b1e6dbf539f3 --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. i686-gnu-2: 6680.3s -> 5448.9s (-18.4%)
  2. mingw-check-1: 1934.3s -> 1595.2s (-17.5%)
  3. x86_64-apple-2: 5510.6s -> 4724.8s (-14.3%)
  4. armhf-gnu: 5229.0s -> 4614.7s (-11.7%)
  5. dist-ohos-aarch64: 4131.8s -> 4594.3s (11.2%)
  6. dist-x86_64-netbsd: 4551.7s -> 5048.3s (10.9%)
  7. x86_64-gnu-llvm-19-1: 3661.9s -> 3277.7s (-10.5%)
  8. mingw-check-tidy: 69.8s -> 77.1s (10.5%)
  9. x86_64-rust-for-linux: 2932.2s -> 2640.3s (-10.0%)
  10. x86_64-apple-1: 6796.5s -> 6121.6s (-9.9%)
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.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ed2d759): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

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

Max RSS (memory usage)

Results (secondary -2.2%)

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

Cycles

Results (primary 1.2%, secondary 1.4%)

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

mean range count
Regressions ❌
(primary)
1.2% [1.0%, 1.3%] 2
Regressions ❌
(secondary)
1.4% [1.3%, 1.4%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.2% [1.0%, 1.3%] 2

Binary size

Results (secondary -0.0%)

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

Bootstrap: 695.323s -> 694.715s (-0.09%)
Artifact size: 371.80 MiB -> 371.77 MiB (-0.01%)

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.

10 participants