Rollup of 12 pull requests #147574

dianqk · 2025-10-10T23:06:02Z

Successful merges:

Regression test for const promotion with Option<Ordering> #145651 (Regression test for const promotion with Option)
implement Extend<{Group, Literal, Punct, Ident}> for TokenStream #145722 (implement Extend<{Group, Literal, Punct, Ident}> for TokenStream)
Promote armv8r-none-eabihf target to Tier 2 #146520 (Promote armv8r-none-eabihf target to Tier 2)
Promote armv7a-none-eabihf to Tier 2 #146522 (Promote armv7a-none-eabihf to Tier 2)
Mitigate thread_local! shadowing issues #147289 (Mitigate thread_local! shadowing issues)
Update rustc-perf submodule #147515 (Update rustc-perf submodule)
compiletest: Use the same directive lines for EarlyProps and ignore/only/needs #147522 (compiletest: Use the same directive lines for EarlyProps and ignore/only/needs)
Replace locals in debuginfo records during ref_prop and dest_prop #147525 (Replace locals in debuginfo records during ref_prop and dest_prop)
Remove StatementKind::Deinit. #147544 (Remove StatementKind::Deinit.)
remove #[rustc_inherit_overflow_checks] from is_multiple_of #147551 (remove #[rustc_inherit_overflow_checks] from is_multiple_of)
Move wasm32-wasip3 to the tier 3 table #147553 (Move wasm32-wasip3 to the tier 3 table)
Stabilize NonZero<u*>::div_ceil #147562 (Stabilize NonZero<u*>::div_ceil)

r? @ghost
@rustbot modify labels: rollup

Co-authored-by: David Tolnay <dtolnay@gmail.com>

This is the target for 32-bit Cortex-A bare-metal, when using the FPU. The target is well tested by the Embedded Devices Working Group, and the soft-float target (armv7a-none-eabi) is already Tier 2.

This is the target for supporting Arm Cortex-R52 bare-metal systems, which are common in safety-critical systems.

Mitigates rust-lang#147006 and rust-lang#99018

…als that are not in debuginfo

Regression test for const promotion with Option<Ordering> https://rust.godbolt.org/z/EjxqE8WcT Fixes rust-lang#139093 Add a regression test to ensure that comparing `Option<Ordering>` to `Some(Ordering::Equal)` does not trigger unnecessary const promotion in MIR. Previously, inlined constants like `Some(Ordering::Equal)` would get promoted, leading to more complex MIR and redundant LLVM IR checks. This test verifies that both the direct form and the `let`-binding form now generate equivalent, simplified MIR. r? cjgillot

…, r=dtolnay implement Extend<{Group, Literal, Punct, Ident}> for TokenStream Tracking issue: rust-lang#112815

…, r=petrochenkov Promote armv8r-none-eabihf target to Tier 2 This PR promotes armv8r-none-eabihf to Tier 2, joining armv7r-none-eabi, armv7r-none-eabihf and armv7a-none-eabi. This PR wil be rebased once rust-lang#146419 completes the queue. > - A tier 2 target must have value to people other than its maintainers. (It may > still be a niche target, but it must not be exclusively useful for an > inherently closed group.) The `armv8r-none-eabihf` target is for the Arm Cortex-R52 processor, as found in a number of Automotive SoCs that have just been released, or are about to be released. Currently SoCs are available from NXP and Renesas. >- A tier 2 target must have a designated team of developers (the "target > maintainers") available to consult on target-specific build-breaking issues, > or if necessary to develop target-specific language or library implementation > details. This team must have at least 2 developers. The Embedded Devices Working Group's Arm Team have just started maintaining this target. > - The target must not place undue burden on Rust developers not specifically > concerned with that target. Rust developers are expected to not gratuitously > break a tier 2 target, but are not expected to become experts in every tier 2 > target, and are not expected to provide target-specific implementations for > every tier 2 target. This target is highly similar to a number of existing Tier 2 targets, including `armv7r-none-eabihf` and so it should not add undue burden. > - The target must provide documentation for the Rust community explaining how > to build for the target using cross-compilation, and explaining how to run > tests for the target. If at all possible, this documentation should show how > to run Rust programs and tests for the target using emulation, to allow > anyone to do so. If the target cannot be feasibly emulated, the documentation > should explain how to obtain and work with physical hardware, cloud systems, > or equivalent. https://doc.rust-lang.org/nightly/rustc/platform-support/armv8r-none-eabihf.html exists and was updated in rust-lang#146419 > - The target must document its baseline expectations for the features or > versions of CPUs, operating systems, libraries, runtime environments, and > similar. I believe it does. > - If introducing a new tier 2 or higher target that is identical to an existing > Rust target except for the baseline expectations for the features or versions > of CPUs, operating systems, libraries, runtime environments, and similar, > then the proposed target must document to the satisfaction of the approving > teams why the specific difference in baseline expectations provides > sufficient value to justify a separate target. The Armv8-R architecture introduces a new FPU type, the fp-armv8, and so this requires a unique target. > - Tier 2 targets must not leave any significant portions of `core` or the > standard library unimplemented or stubbed out, unless they cannot possibly be > supported on the target. It has a full libcore, as per the other arm*-none-* targets. > - The code generation backend for the target should not have deficiencies that > invalidate Rust safety properties, as evaluated by the Rust compiler team. It should be the same backend as `armv7r-none-eabihf` and friends, except for FPU support, which is already covered in `thumbv8m.main-none-eabihf`. There are no issues that I know of. > - If the target supports C code, and the target has an interoperable calling > convention for C code, the Rust target must support that C calling convention > for the platform via `extern "C"`. The C calling convention does not need to > be the default Rust calling convention for the target, however. The ABI is EABI, the same as many other Arm targets. > - The target must build reliably in CI, for all components that Rust's CI > considers mandatory. The https://github.com/rust-embedded/cortex-ar repository regularly builds this target with `-Zbuild-std=core` and it seems fine. > - The approving teams may additionally require that a subset of tests pass in > CI, such as enough to build a functional "hello world" program, `./x.py test > --no-run`, or equivalent "smoke tests". In particular, this requirement may > apply if the target builds host tools, or if the tests in question provide > substantial value via early detection of critical problems. There are no no-std tests in the tree that I'm aware of. > - Building the target in CI must not take substantially longer than the current > slowest target in CI, and should not substantially raise the maintenance > burden of the CI infrastructure. This requirement is subjective, to be > evaluated by the infrastructure team, and will take the community importance > of the target into account. Building libcore is quite fast. > - Tier 2 targets should, if at all possible, support cross-compiling. Tier 2 > targets should not require using the target as the host for builds, even if > the target supports host tools. It does. > - In addition to the legal requirements for all targets (specified in the tier > 3 requirements), because a tier 2 target typically involves the Rust project > building and supplying various compiled binaries, incorporating the target > and redistributing any resulting compiled binaries (e.g. built libraries, > host tools if any) must not impose any onerous license requirements on any > members of the Rust project, including infrastructure team members and those > operating CI systems. This is a subjective requirement, to be evaluated by > the approving teams. Just libcore required (and liballoc). No known issues here. > - Tier 2 targets must not impose burden on the authors of pull requests, or > other developers in the community, to ensure that tests pass for the target. Noted > - The target maintainers should regularly run the testsuite for the target The https://github.com/rust-embedded/cortex-ar repository will be changed to use the rustup component when available. > and should fix any test failures in a reasonably timely fashion. Noted

…hf, r=petrochenkov Promote armv7a-none-eabihf to Tier 2 This PR promotes armv7a-none-eabihf to Tier 2, to join armv7r-none-eabihf and armv7a-none-eabi. I believe it was simply an oversight that it wasn't made Tier 2 before, as most Armv7-A targets have an FPU and it often makes sense to use it. This PR wil be rebased once rust-lang#146419 completes the queue. > - A tier 2 target must have value to people other than its maintainers. (It may > still be a niche target, but it must not be exclusively useful for an > inherently closed group.) The `armv7a-none-eabihf` target is for all Arm Cortex-A processors (either 32-bit only, or in 32-bit mode) where the user wants to use the FPU. >- A tier 2 target must have a designated team of developers (the "target > maintainers") available to consult on target-specific build-breaking issues, > or if necessary to develop target-specific language or library implementation > details. This team must have at least 2 developers. The Embedded Devices Working Group's Arm Team have just started maintaining this target. > - The target must not place undue burden on Rust developers not specifically > concerned with that target. Rust developers are expected to not gratuitously > break a tier 2 target, but are not expected to become experts in every tier 2 > target, and are not expected to provide target-specific implementations for > every tier 2 target. This target is highly similar to a number of existing Tier 2 targets, including `armv7r-none-eabihf` and `armv7a-none-eabi` and so it should not add undue burden. > - The target must provide documentation for the Rust community explaining how > to build for the target using cross-compilation, and explaining how to run > tests for the target. If at all possible, this documentation should show how > to run Rust programs and tests for the target using emulation, to allow > anyone to do so. If the target cannot be feasibly emulated, the documentation > should explain how to obtain and work with physical hardware, cloud systems, > or equivalent. https://doc.rust-lang.org/nightly/rustc/platform-support/armv7a-none-eabi.html was added in rust-lang#146419. It covers the `-eabi` and the `-eabihf` targets. > - The target must document its baseline expectations for the features or > versions of CPUs, operating systems, libraries, runtime environments, and > similar. I believe it does. > - If introducing a new tier 2 or higher target that is identical to an existing > Rust target except for the baseline expectations for the features or versions > of CPUs, operating systems, libraries, runtime environments, and similar, > then the proposed target must document to the satisfaction of the approving > teams why the specific difference in baseline expectations provides > sufficient value to justify a separate target. It uses very similar FPUs to `armv7r-none-eabihf` but is otherwise the same as `armv7a-none-eabi`. > - Tier 2 targets must not leave any significant portions of `core` or the > standard library unimplemented or stubbed out, unless they cannot possibly be > supported on the target. It has a full libcore, as per the other arm*-none-* targets. > - The code generation backend for the target should not have deficiencies that > invalidate Rust safety properties, as evaluated by the Rust compiler team. It should be the same backend as `armv7r-none-eabihf` and friends, except for FPU support, which is already covered in `thumbv8m.main-none-eabihf`. There are no issues that I know of. > - If the target supports C code, and the target has an interoperable calling > convention for C code, the Rust target must support that C calling convention > for the platform via `extern "C"`. The C calling convention does not need to > be the default Rust calling convention for the target, however. The ABI is EABI, the same as many other Arm targets. > - The target must build reliably in CI, for all components that Rust's CI > considers mandatory. The https://github.com/rust-embedded/cortex-ar repository has been changed in rust-embedded/cortex-ar#57 to build this target with `-Zbuild-std=core`. Locally it seems fine. > - The approving teams may additionally require that a subset of tests pass in > CI, such as enough to build a functional "hello world" program, `./x.py test > --no-run`, or equivalent "smoke tests". In particular, this requirement may > apply if the target builds host tools, or if the tests in question provide > substantial value via early detection of critical problems. There are no no-std tests in the tree that I'm aware of. > - Building the target in CI must not take substantially longer than the current > slowest target in CI, and should not substantially raise the maintenance > burden of the CI infrastructure. This requirement is subjective, to be > evaluated by the infrastructure team, and will take the community importance > of the target into account. Building libcore is quite fast. > - Tier 2 targets should, if at all possible, support cross-compiling. Tier 2 > targets should not require using the target as the host for builds, even if > the target supports host tools. It does. > - In addition to the legal requirements for all targets (specified in the tier > 3 requirements), because a tier 2 target typically involves the Rust project > building and supplying various compiled binaries, incorporating the target > and redistributing any resulting compiled binaries (e.g. built libraries, > host tools if any) must not impose any onerous license requirements on any > members of the Rust project, including infrastructure team members and those > operating CI systems. This is a subjective requirement, to be evaluated by > the approving teams. Just libcore required (and liballoc). No known issues here. > - Tier 2 targets must not impose burden on the authors of pull requests, or > other developers in the community, to ensure that tests pass for the target. Noted > - The target maintainers should regularly run the testsuite for the target The https://github.com/rust-embedded/cortex-ar repository will be changed to use the rustup component when available. > and should fix any test failures in a reasonably timely fashion. Noted

…w-mitigate, r=joboet Mitigate `thread_local!` shadowing issues Mitigates rust-lang#147006 and rust-lang#99018. `@rustbot` label T-libs A-macros A-thread-locals A-hygiene

…ethercote Update rustc-perf submodule To bring in rust-lang/rustc-perf#2274, rust-lang/rustc-perf#2275 and rust-lang/rustc-perf#2276. r? `@nnethercote` try-job: dist-x86_64-linux try-job: dist-x86_64-msvc

compiletest: Use the same directive lines for EarlyProps and ignore/only/needs Currently we load each discovered test file to scan it for directives once for EarlyProps parsing, then reload and scan it once *per revision* for ignore processing. If a revision is not ignored, we then reload and scan it again during actual execution. That's a bit silly, so this PR tries to reduce the number of unnecessary file loads and line scans for directive parsing, by reusing the same collection of `DirectiveLine` values for EarlyProps and for each revision's ignores. Each individual directive still needs to be re-parsed a bunch of times, but those steps can at least avoid scanning the whole file, or having to split out names from values. --- There's more that could be done after this, such as only doing known-directive checks once per file, or embedding file paths in each `DirectiveLine`, but I decided to stop here to allow review in modest chunks. r? jieyouxu

Replace locals in debuginfo records during ref_prop and dest_prop Fixes rust-lang#147485. r? cjgillot

Remove StatementKind::Deinit. It is a remnant from the time we deaggreated MIR. Now, it is only constructed by the `LargeEnums` MIR pass, which is disabled by default.

…-checks, r=Amanieu remove `#[rustc_inherit_overflow_checks]` from `is_multiple_of` Most likely this was just a result of copy-pasting. The attribute has no effect, because `%` always uses overflow checks. r? `@Amanieu` cc `@RalfJung`

…nkov Move `wasm32-wasip3` to the tier 3 table rust-lang#147205 says it wanted to add this as a tier 3 target but accidentally added it to the tier 2 table.

…iv_ceil, r=joboet Stabilize `NonZero<u*>::div_ceil` As per rust-lang#132968 (comment) r? libs

dianqk · 2025-10-10T23:07:11Z

@bors r+ rollup=never p=5

bors · 2025-10-10T23:07:14Z

📌 Commit ab7d63a has been approved by dianqk

It is now in the queue for this repository.

bors · 2025-10-10T23:50:58Z

⌛ Testing commit ab7d63a with merge cfce400...

Rollup of 12 pull requests Successful merges: - #145651 (Regression test for const promotion with Option<Ordering>) - #145722 (implement Extend<{Group, Literal, Punct, Ident}> for TokenStream) - #146520 (Promote armv8r-none-eabihf target to Tier 2) - #146522 (Promote armv7a-none-eabihf to Tier 2) - #147289 (Mitigate `thread_local!` shadowing issues) - #147515 (Update rustc-perf submodule) - #147522 (compiletest: Use the same directive lines for EarlyProps and ignore/only/needs) - #147525 (Replace locals in debuginfo records during ref_prop and dest_prop) - #147544 (Remove StatementKind::Deinit.) - #147551 (remove `#[rustc_inherit_overflow_checks]` from `is_multiple_of`) - #147553 (Move `wasm32-wasip3` to the tier 3 table) - #147562 (Stabilize `NonZero<u*>::div_ceil`) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2025-10-11T01:01:25Z

The job aarch64-gnu-debug failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)


  --- stderr
  clang: error: unsupported option '-print-multi-os-directory'
  clang: error: no input files
  config.status: error: in `/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-tools/aarch64-unknown-linux-gnu/release/build/libffi-sys-6562d98fd0e95724/out/libffi-build/aarch64-unknown-linux-gnu':
  config.status: error: Something went wrong bootstrapping makefile fragments
      for automatic dependency tracking.  If GNU make was not used, consider
      re-running the configure script with MAKE="gmake" (or whatever is
      necessary).  You can also try re-running configure with the
      '--disable-dependency-tracking' option to at least be able to build
      the package (albeit without support for automatic dependency tracking).
  See `config.log' for more details

  thread 'main' (101487) panicked at /cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libffi-sys-3.3.2/build/not_msvc.rs:154:5:
  Configuring libffi: exit status: 1 (cd "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-tools/aarch64-unknown-linux-gnu/release/build/libffi-sys-6562d98fd0e95724/out/libffi-build" && CC="clang" CFLAGS="-O3 -ffunction-sections -fdata-sections -fPIC -gdwarf-4 -fno-omit-frame-pointer --target=aarch64-unknown-linux-gnu -Wno-implicit-function-declaration" LC_ALL="C" "sh" "./configure" "--with-pic" "--disable-shared" "--disable-docs" "--prefix" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-tools/aarch64-unknown-linux-gnu/release/build/libffi-sys-6562d98fd0e95724/out/libffi-root")
  stack backtrace:
     0: __rustc::rust_begin_unwind
               at /checkout/library/std/src/panicking.rs:698:5
     1: core::panicking::panic_fmt
               at /checkout/library/core/src/panicking.rs:80:14
     2: build_script_build::common::run_command
               at ./build/common.rs:13:13
     3: build_script_build::not_msvc::configure_libffi
               at ./build/not_msvc.rs:154:5
     4: build_script_build::not_msvc::build_and_link
               at ./build/not_msvc.rs:39:5
     5: build_script_build::main
               at ./build/build.rs:16:9
     6: core::ops::function::FnOnce::call_once
               at /checkout/library/core/src/ops/function.rs:250:5
  note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

bors · 2025-10-11T01:01:57Z

💔 Test failed - checks-actions

dianqk · 2025-10-11T01:21:41Z

@bors retry (clang: error: unsupported option '-print-multi-os-directory')

Qelxiros and others added 29 commits August 21, 2025 16:21

implement Extend<{Group, Literal, Punct, Ident}> for TokenStream

f0fd9cd

Update library/proc_macro/src/lib.rs

ff7081e

Co-authored-by: David Tolnay <dtolnay@gmail.com>

Promote armv7a-none-eabihf to Tier 2

215c936

This is the target for 32-bit Cortex-A bare-metal, when using the FPU. The target is well tested by the Embedded Devices Working Group, and the soft-float target (armv7a-none-eabi) is already Tier 2.

Raise armv8r-none-eabihf to Tier 2

89a5bb6

This is the target for supporting Arm Cortex-R52 bare-metal systems, which are common in safety-critical systems.

Update target spec to say Tier 2.

bfddf29

Mitigate thread_local! shadowing issues

d6fdadb

Mitigates rust-lang#147006 and rust-lang#99018

Use the same directive lines for EarlyProps and ignore/only/needs

f3f8385

Add regression test for 147485

690071c

MIR validation: ensure that debuginfo records are not emitted for loc…

9462e73

…als that are not in debuginfo

Replace locals in debuginfo records during ref_prop

b2e81b0

remove #[rustc_inherit_overflow_checks] from is_multiple_of

5ab4e18

Move to the tier 3 table

6660d75

Adding a regression test (const promotion with Option<Ordering>)

c86474c

Remove StatementKind::Deinit.

b7c2b3d

Update rustc-perf submodule

ce671f9

Replace locals in debuginfo records during dest_prop

1ee2c58

Stabilize unsigned_nonzero_div_ceil

4eccd02

Rollup merge of rust-lang#145722 - Qelxiros:112815-tokenstream-extend…

6967a85

…, r=dtolnay implement Extend<{Group, Literal, Punct, Ident}> for TokenStream Tracking issue: rust-lang#112815

Rollup merge of rust-lang#147289 - Jules-Bertholet:thread_local-shado…

b017808

…w-mitigate, r=joboet Mitigate `thread_local!` shadowing issues Mitigates rust-lang#147006 and rust-lang#99018. `@rustbot` label T-libs A-macros A-thread-locals A-hygiene

Rollup merge of rust-lang#147515 - Kobzol:update-rustc-perf, r=lqd,nn…

046260e

…ethercote Update rustc-perf submodule To bring in rust-lang/rustc-perf#2274, rust-lang/rustc-perf#2275 and rust-lang/rustc-perf#2276. r? `@nnethercote` try-job: dist-x86_64-linux try-job: dist-x86_64-msvc

Rollup merge of rust-lang#147525 - dianqk:ref_prop_debuginfo, r=cjgillot

fce1bea

Replace locals in debuginfo records during ref_prop and dest_prop Fixes rust-lang#147485. r? cjgillot

Rollup merge of rust-lang#147544 - cjgillot:nodeinit, r=saethlin

0ef3d20

Remove StatementKind::Deinit. It is a remnant from the time we deaggreated MIR. Now, it is only constructed by the `LargeEnums` MIR pass, which is disabled by default.

Rollup merge of rust-lang#147553 - saethlin:wasip3-tier-3, r=petroche…

6d8272f

…nkov Move `wasm32-wasip3` to the tier 3 table rust-lang#147205 says it wanted to add this as a tier 3 target but accidentally added it to the tier 2 table.

Rollup merge of rust-lang#147562 - tyilo:stabilize-unsigned_nonzero_d…

ab7d63a

…iv_ceil, r=joboet Stabilize `NonZero<u*>::div_ceil` As per rust-lang#132968 (comment) r? libs

rustbot added the A-compiletest Area: The compiletest test runner label Oct 10, 2025

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 10, 2025

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 11, 2025

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 11, 2025

weihanglo mentioned this pull request Oct 11, 2025

libffi build error on aarch64-gnu-debug: unsupported option '-print-multi-os-directory' #147556

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 12 pull requests #147574

Rollup of 12 pull requests #147574

dianqk commented Oct 10, 2025 •

edited by rustbot

Loading

Uh oh!

dianqk commented Oct 10, 2025

Uh oh!

bors commented Oct 10, 2025

Uh oh!

bors commented Oct 10, 2025

Uh oh!

rust-log-analyzer commented Oct 11, 2025

Uh oh!

bors commented Oct 11, 2025

Uh oh!

dianqk commented Oct 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Rollup of 12 pull requests #147574

Are you sure you want to change the base?

Rollup of 12 pull requests #147574

Conversation

dianqk commented Oct 10, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dianqk commented Oct 10, 2025

Uh oh!

bors commented Oct 10, 2025

Uh oh!

bors commented Oct 10, 2025

Uh oh!

rust-log-analyzer commented Oct 11, 2025

Uh oh!

bors commented Oct 11, 2025

Uh oh!

dianqk commented Oct 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

dianqk commented Oct 10, 2025 •

edited by rustbot

Loading