Skip to content

Update compiler-builtins to 0.1.155#139934

Merged
bors merged 1 commit intorust-lang:masterfrom
tgross35:update-builtins
Apr 18, 2025
Merged

Update compiler-builtins to 0.1.155#139934
bors merged 1 commit intorust-lang:masterfrom
tgross35:update-builtins

Conversation

@tgross35
Copy link
Contributor

@tgross35 tgross35 commented Apr 16, 2025 •
edited
Loading

Includes the following changes:

  • Replace #[naked] with #[unsafe(naked)] 1 2
  • Replace bl! with asm_sym 3

try-job: armhf-gnu
try-job: aarch64-apple
try-job: dist-apple-various

@rustbot
Copy link
Collaborator

rustbot commented Apr 16, 2025

r? @thomcc

rustbot has assigned @thomcc.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Apr 16, 2025
@rustbot
Copy link
Collaborator

rustbot commented Apr 16, 2025

These commits modify the library/Cargo.lock file. Unintentional changes to library/Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@folkertdev
Copy link
Contributor

folkertdev commented Apr 16, 2025 •
edited
Loading

Looks like this runs into bootstrap not yet accepting #[unsafe(naked)]. That's frustrating... Is there anything that can be done here? (e.g. would cherry-picking to beta help in theory to unblock this? guess not because you'd then still need to update the version used for bootstrapping)

@tgross35
Copy link
Contributor Author

tgross35 commented Apr 16, 2025

Yeah that is an annoying cycle. Any idea if bootstrap sets cfg(bootstrap) in dependencies? Using that in builtins is probably the easiest option. If not then a beta backport might be worth asking about so we aren't blocked until the next fork+bump in ~3 weeks. Usually whenever a new beta is released stage0 can be bumped, even if it's just a backport.

We will likely make builtins a subtree in the near future to help avoid some of this, but I wouldn't expect that to be any faster.

@folkertdev folkertdev mentioned this pull request Apr 17, 2025
Merged
@tgross35
Update compiler-builtins to 0.1.155
7d6f41b 
Includes the following changes:

* Replace `#[naked]` with `#[unsafe(naked)]` [1] [2]
* Replace `bl!` with `asm_sym` [3]

[1]: rust-lang/compiler-builtins#817
[2]: rust-lang/compiler-builtins#821
[3]: rust-lang/compiler-builtins#820
@tgross35 tgross35 changed the title Update compiler-builtins to 0.1.154 Update compiler-builtins to 0.1.155 Apr 17, 2025
@tgross35
Copy link
Contributor Author

tgross35 commented Apr 17, 2025

Adding some try jobs since this now includes an update to arm asm

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 17, 2025
@bors
Auto merge of rust-lang#139934 - tgross35:update-builtins, r=<try>
5981702 
Update `compiler-builtins` to 0.1.155

Includes the following changes:

* Replace `#[naked]` with `#[unsafe(naked)]` [1] [2]
* Replace `bl!` with `asm_sym` [3]

[1]: rust-lang/compiler-builtins#817
[2]: rust-lang/compiler-builtins#821
[3]: rust-lang/compiler-builtins#820

try-job: armhf-gnu
try-job: aarch64-apple
try-job: dist-apple-various
@bors
Copy link
Collaborator

bors commented Apr 17, 2025

⌛ Trying commit 7d6f41b with merge 5981702...

@folkertdev folkertdev mentioned this pull request Apr 17, 2025
Merged
@bors
Copy link
Collaborator

bors commented Apr 17, 2025

☀️ Try build successful - checks-actions
Build commit: 5981702 (5981702d5b6481f6efc4bca373a32a43852723d5)

@tgross35
Copy link
Contributor Author

tgross35 commented Apr 17, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 17, 2025

📌 Commit 7d6f41b 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. labels Apr 17, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 18, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2025
@bors
Auto merge of rust-lang#139997 - matthiaskrgr:rollup-a1fe5zg, r=matth…
8bcd932 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#137881 (Add `copy_within` to `IndexSlice`)
 - rust-lang#138599 (avoid overflow when generating debuginfo for expanding recursive types)
 - rust-lang#139934 (Update `compiler-builtins` to 0.1.155)
 - rust-lang#139976 (run-make: drop `os_pipe` workaround now that `anonymous_pipe` is stable on beta)
 - rust-lang#139989 (tests: adjust 101082 test for LLVM 21 fix)
 - rust-lang#139991 (remove stray file)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2025
@bors
Auto merge of rust-lang#139997 - matthiaskrgr:rollup-a1fe5zg, r=matth…
6a0bd27 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#137881 (Add `copy_within` to `IndexSlice`)
 - rust-lang#138599 (avoid overflow when generating debuginfo for expanding recursive types)
 - rust-lang#139934 (Update `compiler-builtins` to 0.1.155)
 - rust-lang#139976 (run-make: drop `os_pipe` workaround now that `anonymous_pipe` is stable on beta)
 - rust-lang#139989 (tests: adjust 101082 test for LLVM 21 fix)
 - rust-lang#139991 (remove stray file)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit af61fdf into rust-lang:master Apr 18, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 18, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2025
@rust-timer
Unrolled build for rust-lang#139934
4578478 
Rollup merge of rust-lang#139934 - tgross35:update-builtins, r=tgross35

Update `compiler-builtins` to 0.1.155

Includes the following changes:

* Replace `#[naked]` with `#[unsafe(naked)]` [1] [2]
* Replace `bl!` with `asm_sym` [3]

[1]: rust-lang/compiler-builtins#817
[2]: rust-lang/compiler-builtins#821
[3]: rust-lang/compiler-builtins#820

try-job: armhf-gnu
try-job: aarch64-apple
try-job: dist-apple-various
@tgross35 tgross35 deleted the update-builtins branch April 18, 2025 17:59
@traviscross traviscross mentioned this pull request Apr 18, 2025
Merged
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Apr 19, 2025
@matthiaskrgr
Rollup merge of rust-lang#139934 - tgross35:update-builtins, r=tgross35
4b57af8 
Update `compiler-builtins` to 0.1.155

Includes the following changes:

* Replace `#[naked]` with `#[unsafe(naked)]` [1] [2]
* Replace `bl!` with `asm_sym` [3]

[1]: rust-lang/compiler-builtins#817
[2]: rust-lang/compiler-builtins#821
[3]: rust-lang/compiler-builtins#820

try-job: armhf-gnu
try-job: aarch64-apple
try-job: dist-apple-various
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

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.88.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tgross35 @rustbot @rust-log-analyzer @folkertdev @bors @thomcc