Make target pointer width in target json an integer #144443

WaffleLapkin · 2025-07-25T10:20:13Z

r? Noratrieb
cc @RalfJung (https://github.com/rust-lang/rust/pull/142352/files#r2230380120)

rustbot · 2025-07-25T10:20:18Z

Noratrieb is not on the review rotation at the moment.
They may take a while to respond.

rustbot · 2025-07-25T10:20:22Z

This PR modifies run-make tests.

cc @jieyouxu

These commits modify compiler targets.
(See the Target Tier Policy.)

Some changes occurred in src/tools/compiletest

cc @jieyouxu

Noratrieb

I'm unsure if it's worth breaking everyone over such a minor improvement.. maybe? maybe not?

Noratrieb · 2025-07-25T10:32:18Z

I'm inclined to say yes, but it would probably be good to get this merged today so it can be in the same nightly as the other breaking change instead of two consecutive nightlies (it would also be fine to do that, but less cool)

RalfJung · 2025-07-25T11:39:31Z

I'm unsure if it's worth breaking everyone over such a minor improvement.. maybe? maybe not?

We already did that with #144443... the current state is just inconsistent.

But, no strong opinion.

WaffleLapkin · 2025-07-25T11:59:57Z

@Noratrieb what's the other breaking change? #142352 has been merged for over a month..

RalfJung · 2025-07-25T13:31:22Z

@Noratrieb what's the other breaking change? #142352 has been merged for over a month..

Uh, but then why did Miri CI only start failing today?

Something changed in 9748d87...b56aaec.

RalfJung · 2025-07-25T13:36:24Z

The breaking change was probably #144218.

src/tools/compiletest/src/common.rs

WaffleLapkin · 2025-07-25T13:41:32Z

The only relevant change I see is #144218, but that doesn't explain anything, it should have been failing with #142352, I don't see how it could have accepted c-int-width being a string...

RalfJung · 2025-07-25T13:44:17Z

It might be that the field of wrong type just got ignored, which is exactly why Nora ported this to serde.

WaffleLapkin · 2025-07-25T13:47:32Z

You are right indeed. The code in #142352:

                if let Some(s) = obj.remove(name).and_then(|b| b.as_u64()) {
                    base.$key_name = s as $int_ty;
                }

and_then(|b| b.as_u64()) makes it so non-integers are ignored.

compiler/rustc_target/src/spec/mod.rs

Rollup merge of #144848 - Zalathar:ui-fulldeps, r=clubby789 For "stage 1" ui-fulldeps, use the stage 1 compiler to query target info Testing ui-fulldeps in "stage 1" actually uses the stage 0 compiler, so that test programs can link against stage 1 rustc crates. Unfortunately, using the stage 0 compiler causes problems when compiletest tries to obtain target information from the compiler, but the output format has changed since the last bootstrap beta bump. We can work around this by also providing compiletest with a stage 1 compiler, and having it use that compiler to query for target information. --- This fixes the stage 1 ui-fulldeps failure seen at #144443 (comment).

For "stage 1" ui-fulldeps, use the stage 1 compiler to query target info Testing ui-fulldeps in "stage 1" actually uses the stage 0 compiler, so that test programs can link against stage 1 rustc crates. Unfortunately, using the stage 0 compiler causes problems when compiletest tries to obtain target information from the compiler, but the output format has changed since the last bootstrap beta bump. We can work around this by also providing compiletest with a stage 1 compiler, and having it use that compiler to query for target information. --- This fixes the stage 1 ui-fulldeps failure seen at rust-lang/rust#144443 (comment).

WaffleLapkin · 2025-08-04T09:12:30Z

@bors try jobs=x86_64-gnu-llvm-19-3

let's check if the failure is gone now that #144848 is merged

rust-bors · 2025-08-04T09:12:33Z

⌛ Trying commit c4ca575 with merge f7c55e9…

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

…<try> Make target pointer width in target json an integer try-job: x86_64-gnu-llvm-19-3

rust-bors · 2025-08-04T11:19:20Z

☀️ Try build successful (CI)
Build commit: f7c55e9 (f7c55e90b43e1f04d6484737deed9bc4d9584a16, parent: e1b9081e699065badfc1a9419ec9566e5c8615c4)

WaffleLapkin · 2025-08-04T11:31:20Z

@bors r=Noratrieb

bors · 2025-08-04T11:31:23Z

📌 Commit c4ca575 has been approved by Noratrieb

It is now in the queue for this repository.

…r-width, r=Noratrieb Make target pointer width in target json an integer r? Noratrieb cc `@RalfJung` (https://github.com/rust-lang/rust/pull/142352/files#r2230380120)

…r-width, r=Noratrieb Make target pointer width in target json an integer r? Noratrieb cc ``@RalfJung`` (https://github.com/rust-lang/rust/pull/142352/files#r2230380120)

Rollup of 16 pull requests Successful merges: - #143857 (Port #[macro_export] to the new attribute parsing infrastructure) - #144133 (Stabilize const TypeId::of) - #144369 (Upgrade semicolon_in_expressions_from_macros from warn to deny) - #144443 (Make target pointer width in target json an integer) - #144473 (Address libunwind.a inconsistency issues in the bootstrap program) - #144659 (bootstrap: refactor mingw dist and fix gnullvm) - #144682 (Stabilize `strict_overflow_ops`) - #144794 (Port `#[coroutine]` to the new attribute system) - #144835 (Anonymize binders in tail call sig) - #144836 (Change visibility of Args new function) - #144900 (Stabilize `unsigned_signed_diff` feature) - #144903 (Rename `begin_panic_handler` to `panic_handler`) - #144910 (Add regression tests for seemingly fixed issues) - #144926 (Correct the use of `must_use` on btree::IterMut) - #144928 (Drop `rust-version` from `rustc_thread_pool`) - #144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) Failed merges: - #144914 (Add support for `ty::Instance` path shortening in diagnostics) r? `@ghost` `@rustbot` modify labels: rollup

Kobzol · 2025-08-05T07:06:12Z

Most likely failed in #144942 (comment).

@bors r-

Zalathar · 2025-08-05T11:33:59Z

Ah, the problem seems to be this cargo test including a hardcoded target.json file with the older syntax: rust-lang/cargo#15026

rustbot · 2025-08-05T13:58:51Z

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

compiler-builtins is developed in its own repository. If possible, consider making this change to rust-lang/compiler-builtins instead.

cc @tgross35

WaffleLapkin · 2025-08-05T14:02:02Z

I ran rg '"target-pointer-width": "' and fixed all the occurrences, maybe now it'll be fine :')

rustbot assigned Noratrieb Jul 25, 2025

Noratrieb reviewed Jul 25, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

WaffleLapkin force-pushed the integer-target-pointer-width branch from bb5b5c5 to 283f21b Compare July 25, 2025 11:55

This comment has been minimized.

Sign in to view

WaffleLapkin force-pushed the integer-target-pointer-width branch from 283f21b to 267f0bd Compare July 25, 2025 12:35

This comment has been minimized.

Sign in to view

WaffleLapkin force-pushed the integer-target-pointer-width branch from b64ab4a to b2871e5 Compare July 25, 2025 13:33

RalfJung reviewed Jul 25, 2025

View reviewed changes

src/tools/compiletest/src/common.rs Outdated Show resolved Hide resolved

RalfJung reviewed Jul 25, 2025

View reviewed changes

compiler/rustc_target/src/spec/mod.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

jieyouxu self-assigned this Jul 25, 2025

jieyouxu mentioned this pull request Jul 28, 2025

Consider compiletest a staged ToolStd tool #144563

Closed

WaffleLapkin force-pushed the integer-target-pointer-width branch from ffe4f0c to 1a5b2b0 Compare August 4, 2025 07:16

WaffleLapkin added 3 commits August 4, 2025 11:11

allow using target_val! with a rename

8adc296

turn pointer width into an integer in target.json

be42f3f

accept integer target-pointer-width in compiletest

6caa8ff

WaffleLapkin force-pushed the integer-target-pointer-width branch from 1a5b2b0 to c4ca575 Compare August 4, 2025 09:11

rust-bors bot added a commit that referenced this pull request Aug 4, 2025

Auto merge of #144443 - WaffleLapkin:integer-target-pointer-width, r=…

f7c55e9

…<try> Make target pointer width in target json an integer try-job: x86_64-gnu-llvm-19-3

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 Aug 4, 2025

Zalathar mentioned this pull request Aug 5, 2025

Rollup of 16 pull requests #144942

Closed

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 Aug 5, 2025

Kobzol mentioned this pull request Aug 5, 2025

Rollup of 15 pull requests #144943

Closed

This comment was marked as outdated.

Sign in to view

fix target-pointer-width in tests

51134eb

WaffleLapkin force-pushed the integer-target-pointer-width branch from c4ca575 to 51134eb Compare August 5, 2025 13:58

rustbot added the A-compiler-builtins Area: compiler-builtins (https://github.com/rust-lang/compiler-builtins) label Aug 5, 2025

Make target pointer width in target json an integer #144443

Are you sure you want to change the base?

Make target pointer width in target json an integer #144443

Conversation

WaffleLapkin commented Jul 25, 2025

Uh oh!

rustbot commented Jul 25, 2025

Uh oh!

rustbot commented Jul 25, 2025

Uh oh!

Noratrieb left a comment

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

Noratrieb commented Jul 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Jul 25, 2025

Uh oh!

WaffleLapkin commented Jul 25, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

RalfJung commented Jul 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Jul 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

WaffleLapkin commented Jul 25, 2025

Uh oh!

RalfJung commented Jul 25, 2025

Uh oh!

WaffleLapkin commented Jul 25, 2025

Uh oh!

Uh oh!

This comment has been minimized.

WaffleLapkin commented Aug 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-bors bot commented Aug 4, 2025

Uh oh!

rust-bors bot commented Aug 4, 2025

Uh oh!

WaffleLapkin commented Aug 4, 2025

Uh oh!

bors commented Aug 4, 2025

Uh oh!

Kobzol commented Aug 5, 2025

Uh oh!

This comment was marked as outdated.

Zalathar commented Aug 5, 2025

Uh oh!

rustbot commented Aug 5, 2025

Uh oh!

WaffleLapkin commented Aug 5, 2025

Uh oh!

Uh oh!

Noratrieb commented Jul 25, 2025 •

edited

Loading

RalfJung commented Jul 25, 2025 •

edited

Loading

RalfJung commented Jul 25, 2025 •

edited

Loading

WaffleLapkin commented Aug 4, 2025 •

edited

Loading