Skip to content

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Oct 9, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

madsmtm and others added 13 commits October 7, 2025 17:21
Use the span of the types that don't fit, rather than the span of the
whole signature.
…ployment-target, r=davidtwco

Set the minimum deployment target for `aarch64-apple-watchos`

To match what's done in LLVM 21 and Xcode 26, watchOS 26 is the first OS version that actually runs true Aarch64 binaries. This affects the object files we create, and the linker invocation when using `-Clinker=ld`.

See also investigation in rust-lang#147223.
… r=davidtwco

cmse: improve error messages

tracking issue: rust-lang#81391
tracking issue: rust-lang#75835

Improves the cmse error messages (e.g. by using more accurate spans), and attempts to clean up the control flow a bit. This is partially in preparation for one final addition: warnings when `union` types or types with niches cross the security boundary. That will be a folllow-up.

Meant to be reviewed commit-by-commit

r? `@davidtwco`
…ethercote

Update rustc-perf submodule

To bring in rust-lang/rustc-perf#2274.

r? `@nnethercote`
x86_64-bigint-helpers test: update test assertion to cover registers r8 and r9

Adapts the test expectation to cover the case where a register like `r9` is chosen. Update is similar to the other such expectation in the previous function in the same test file.

Found by our experimental rust + LLVM @ HEAD bot:
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/40528/steps/canvas?sid=0199c8d7-f65a-4bbc-8d7f-e62d4ddcc65e#0199c8d7-f7ab-464d-a0fd-b4b8862a11d3/1047-1175

r? durin42
`@rustbot` label: +llvm-main
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 9, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Oct 9, 2025

📌 Commit 5371ed7 has been approved by matthiaskrgr

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 Oct 9, 2025
bors added a commit that referenced this pull request Oct 9, 2025
Rollup of 4 pull requests

Successful merges:

 - #147447 (Set the minimum deployment target for `aarch64-apple-watchos`)
 - #147479 (cmse: improve error messages)
 - #147515 (Update rustc-perf submodule)
 - #147523 (x86_64-bigint-helpers test: update test assertion to cover registers r8 and r9)

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

bors commented Oct 9, 2025

⌛ Testing commit 5371ed7 with merge 81f15b7...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
   2: std::backtrace::Backtrace::create
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117/library\std\src\backtrace.rs:331
   3: std::backtrace::Backtrace::capture
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117/library\std\src\backtrace.rs:296
   4: anyhow::context::ext::impl$0::ext_context<std::io::error::Error,alloc::string::String>
             at C:\Users\runneradmin\.cargo\registry\src\index.crates.io-1949cf8c6b5b557f\anyhow-1.0.86\src\backtrace.rs:27
   5: anyhow::context::impl$0::with_context<std::fs::ReadDir,std::io::error::Error,alloc::string::String,collector::toolchain::impl$8::fill_libraries::closure$0::closure_env$0>
             at C:\Users\runneradmin\.cargo\registry\src\index.crates.io-1949cf8c6b5b557f\anyhow-1.0.86\src\context.rs:65
   6: collector::toolchain::impl$8::fill_libraries::closure$0
             at .\collector\src\toolchain.rs:372
   7: collector::toolchain::ToolchainComponents::fill_libraries
             at .\collector\src\toolchain.rs:416
   8: collector::toolchain::ToolchainComponents::from_binaries_and_libdir
             at .\collector\src\toolchain.rs:364
   9: collector::toolchain::get_local_toolchain
             at .\collector\src\toolchain.rs:630
  10: collector::main_result::closure$5
             at .\collector\src\bin\collector.rs:1225
  11: collector::main_result
             at .\collector\src\bin\collector.rs:1281
  12: collector::main
             at .\collector\src\bin\collector.rs:262
  13: core::ops::function::FnOnce::call_once<void (*)(),tuple$<> >
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117\library\core\src\ops\function.rs:250
  14: core::hint::black_box
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117\library\core\src\hint.rs:472
  15: std::sys::backtrace::__rust_begin_short_backtrace<void (*)(),tuple$<> >
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117\library\std\src\sys\backtrace.rs:158
  16: std::rt::lang_start::closure$0<tuple$<> >
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117\library\std\src\rt.rs:206
  17: std::rt::lang_start_internal::closure$0
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117/library\std\src\rt.rs:175
  18: std::panicking::catch_unwind::do_call
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117/library\std\src\panicking.rs:590
  19: std::panicking::catch_unwind
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117/library\std\src\panicking.rs:553
  20: std::panic::catch_unwind
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117/library\std\src\panic.rs:359
  21: std::rt::lang_start_internal
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117/library\std\src\rt.rs:171
  22: std::rt::lang_start<tuple$<> >
             at /rustc/bb624dcb4c8ab987e10c0808d92d76f3b84dd117\library\std\src\rt.rs:205
  23: main
  24: invoke_main
             at D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl:78
  25: __scrt_common_main_seh

@bors
Copy link
Collaborator

bors commented Oct 9, 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 Oct 9, 2025
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants