Skip to content

Update the compiler-builtins subtree #142489

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
Merged
merged 10 commits into from
Jun 14, 2025
Merged

Update the compiler-builtins subtree #142489

merged 10 commits into from
Jun 14, 2025
+554 −157

Conversation

tgross35
Copy link
Contributor

Update the Josh subtree to rust-lang/compiler-builtins@7c46e921c117.

r? @ghost

tgross35 and others added 10 commits June 10, 2025 06:49
@tgross35
compiler-builtins: Remove unused lints.rust table
3497619 
The unexpected configs are now unused or known to `rustc` in our CI.
@tgross35
ci: Fix a typo that was causing a command failure
b5fafd9
@qinghon
Eliminate build.rs-generated Aarch64 atomic macros (rust-lang#951)
013e06c 
Replace `build.rs` Rust generation with macros, using the unstable
`${concat(...)}`.

Fixes: rust-lang/compiler-builtins#947
@tgross35
fmaximum,fminimum: Fix incorrect result and add tests
10ba25f 
After adding tests, the current implementation for fminimum fails when
provided a negative zero and NaN as inputs:

    ---- math::fminimum_fmaximum_num::tests::fmaximum_num_spec_tests_f64 stdout ----

    thread 'math::fminimum_fmaximum_num::tests::fmaximum_num_spec_tests_f64' panicked at libm/src/math/fminimum_fmaximum_num.rs:240:13:
    fmaximum_num(-0x0p+0, NaN)
    l: NaN (0x7ff8000000000000)
    r: -0.0 (0x8000000000000000)

    ---- math::fminimum_fmaximum_num::tests::fmaximum_num_spec_tests_f32 stdout ----

    thread 'math::fminimum_fmaximum_num::tests::fmaximum_num_spec_tests_f32' panicked at libm/src/math/fminimum_fmaximum_num.rs:240:13:
    fmaximum_num(-0x0p+0, NaN)
    l: NaN (0x7fc00000)
    r: -0.0 (0x80000000)

Add more thorough spec tests for these functions and correct the
implementations.

Canonicalization is also moved to a trait method to centralize
documentation about what it does and doesn't do.
@tgross35
Clean up and sort manifest keys
509b8f2 
Use a consistent ordering for top-level manifest keys, and remove those
that are now redundant (`homapage` isn't supposed to be the same as
`repository`, and `documentation` automatically points to docs.rs now).
@tgross35
Mark compiler-builtins as publish = false
19b47ae 
Now that this repository is a subtree, we have no need to continue
publishing `compiler-builtins`.
@tgross35
Delete .release-plz.toml
4b2b463 
The config file is not needed anymore since compiler-builtins is no
longer published. Removing it will resolve a CI failure.
@tgross35
Update the upstream Rust version
c629d85 
To prepare for merging from rust-lang/rust, set the version file to:

    d087f11 Auto merge of rust-lang#134841 - estebank:serde-attr-4, r=wesleywiser
@tgross35
Merge ref 'd087f112b7d1:/library/compiler-builtins' from https://gith…
c1cd1ef 
…ub.com/rust-lang/rust

Pull recent changes from rust-lang/rust via Josh.

Upstream ref: d087f11
Filtered ref: 2d43ce8ac022170e5383f7e5a188b55564b6566a
@tgross35
Work around out-of-tree testing with a shim crate
7222fa6 
Out-of-tree testing is broken with the most recent update from
rust-lang/rust because it makes `compiler-builtins` depend on `core` by
path, which isn't usually available. In order to enable testing outside
of rust-lang/rust, add a new crate `builtins-shim` that uses the same
source as `compiler-builtins` but drops the `core` dependency. This has
replaced `compiler-builtins` as the workspace member and entrypoint for
tests.
@rustbot rustbot added A-compiler-builtins Area: compiler-builtins (https://github.com/rust-lang/compiler-builtins) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 14, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 14, 2025

⚠️ Warning ⚠️

  • There are issue links (such as #123) in the commit messages of the following commits.
    Please move them to the PR description, to avoid spamming the issues with references to the commit, and so this bot can automatically canonicalize them to avoid issues with subtree.

  • The following commits have merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

    You can start a rebase with the following commands:

    $ # rebase
$ git pull --rebase https://github.com/rust-lang/rust.git master
$ git push --force-with-lease

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 14, 2025
@tgross35
Copy link
Contributor Author

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 14, 2025

📌 Commit 7222fa6 has been approved by tgross35

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. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 14, 2025
@Urgau
Copy link
Member

Urgau commented Jun 14, 2025

@tgross35 if you want to avoid the merge commits triagebot warnings, you can use of of the excluded titles (ie "Subtree update of compiler-builtins" for example) or add yours to the exclusion list.

@Urgau
Copy link
Member

Urgau commented Jun 14, 2025

Regarding the issue links warnings, we should add this config to your triagebot.toml file

rust/triagebot.toml

Lines 1453 to 1456 in 64033a4

# Canonicalize issue numbers to avoid closing the wrong issue
# when commits are included in subtrees, as well as warning links in commits.
# Documentation at: https://forge.rust-lang.org/triagebot/issue-links.html
[issue-links]

@tgross35
Copy link
Contributor Author

Oh yeah thanks for the heads up, this title comes from what the tooling currently produces and I keep forgetting to change one thing or the other. I'll do that 👍

Regarding the issue links warnings, we should add this config to your triagebot.toml file

I don't think we have triagebot enabled on compiler-builtins but unfortunately I don't think the two cases here would have been caught by it :/. One of the flagged commits is the default message for a squash merge (I should have caught that one) and the other one is a rust-lang/rust "auto merge of #xxxx" mention.

@tgross35
Copy link
Contributor Author

Hm, the latter one I can probably actually work around since it's produced by tooling

jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 14, 2025
@jhpratt
Rollup merge of rust-lang#142489 - tgross35:update-builtins, r=tgross35
08dc3b0 
Update the `compiler-builtins` subtree

Update the Josh subtree to rust-lang/compiler-builtins@7c46e921c117.

r? `@ghost`
@jhpratt jhpratt mentioned this pull request Jun 14, 2025
Closed
@tgross35
Copy link
Contributor Author

rust-lang/compiler-builtins#955 for that bit

@matthiaskrgr matthiaskrgr mentioned this pull request Jun 14, 2025
Merged
@Urgau Urgau mentioned this pull request Jun 14, 2025
Merged
bors added a commit that referenced this pull request Jun 14, 2025
@bors
Auto merge of #142492 - matthiaskrgr:rollup-a132ytq, r=matthiaskrgr
9822e3d 
Rollup of 9 pull requests

Successful merges:

 - #140593 (Temporary lifetime extension through tuple struct and tuple variant constructors)
 - #141399 ([rustdoc] Give more information into extracted doctest information)
 - #141493 (Delegate `<SocketAddr as Debug>` to `ByteStr`)
 - #141811 (Unimplement unsized_locals)
 - #142243 (float tests: deduplicate min, max, and rounding tests)
 - #142464 (variadic functions: remove list of supported ABIs from error)
 - #142477 (Fix incorrect suggestion when calling an associated type with a type anchor)
 - #142484 (Remove unneeded lifetime bound from signature of BTreeSet::extract_if)
 - #142489 (Update the `compiler-builtins` subtree)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fd1f479 into rust-lang:master Jun 14, 2025
10 checks passed
rust-timer added a commit that referenced this pull request Jun 14, 2025
@rust-timer
Unrolled build for #142489
73e9fa2 
Rollup merge of #142489 - tgross35:update-builtins, r=tgross35

Update the `compiler-builtins` subtree

Update the Josh subtree to rust-lang/compiler-builtins@7c46e921c117.

r? `@ghost`
@rustbot rustbot added this to the 1.89.0 milestone Jun 14, 2025
@tgross35 tgross35 deleted the update-builtins branch June 14, 2025 16:46
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Jun 15, 2025
@bors
Auto merge of #142492 - matthiaskrgr:rollup-a132ytq, r=matthiaskrgr
9b89c65 
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#140593 (Temporary lifetime extension through tuple struct and tuple variant constructors)
 - rust-lang/rust#141399 ([rustdoc] Give more information into extracted doctest information)
 - rust-lang/rust#141493 (Delegate `<SocketAddr as Debug>` to `ByteStr`)
 - rust-lang/rust#141811 (Unimplement unsized_locals)
 - rust-lang/rust#142243 (float tests: deduplicate min, max, and rounding tests)
 - rust-lang/rust#142464 (variadic functions: remove list of supported ABIs from error)
 - rust-lang/rust#142477 (Fix incorrect suggestion when calling an associated type with a type anchor)
 - rust-lang/rust#142484 (Remove unneeded lifetime bound from signature of BTreeSet::extract_if)
 - rust-lang/rust#142489 (Update the `compiler-builtins` subtree)

r? `@ghost`
`@rustbot` modify labels: rollup
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
A-compiler-builtins Area: compiler-builtins (https://github.com/rust-lang/compiler-builtins) has-merge-commits PR has merge commits, merge with caution. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.89.0
Development

Successfully merging this pull request may close these issues.
5 participants
@tgross35 @rustbot @bors @Urgau @qinghon