Skip to content
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

Update compiler-builtins to 0.1.147 #137297

Merged
merged 1 commit into from
Feb 24, 2025
Merged

Update compiler-builtins to 0.1.147 #137297

merged 1 commit into from
Feb 24, 2025
+6 −6

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Feb 20, 2025 •
edited
Loading

Removes an ABI hack that used <2 x i64> to return i128 in xmm0 on Windows 1.

Link: #116558
Link: rust-lang/compiler-builtins#758

try-job: x86_64-mingw-1
try-job: x86_64-mingw-2

r? @ghost

@rustbot rustbot added 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. labels Feb 20, 2025
@rustbot
Copy link
Collaborator

rustbot commented Feb 20, 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.

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Feb 20, 2025
@tgross35
Copy link
Contributor Author

@bors try

@tgross35 tgross35 mentioned this pull request Feb 20, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 20, 2025
@bors
Auto merge of rust-lang#137297 - tgross35:update-builtins, r=<try>
bf4aacc 
Update `compiler-builtins` to 0.1.147

Removes an ABI hack that used `<2 x i64>` to return `i128` in `xmm0` on Windows [1].

[1]: rust-lang/compiler-builtins#759
Link: rust-lang#116558
Link: rust-lang/compiler-builtins#758

try-job: x86_64-msvc-1
try-job: x86_64-msvc-2
try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
@bors
Copy link
Contributor

bors commented Feb 20, 2025

⌛ Trying commit e80f1a4 with merge bf4aacc...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Feb 20, 2025

💔 Test failed - checks-actions

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 20, 2025
@tgross35
Copy link
Contributor Author

Hm. Looking at both the asm and llvm ir for the symbols previously marked with win64_128bit_abi_hack, the only difference I see is <16 x i8> vs <2 x i64> for the return type.

@tgross35
Copy link
Contributor Author

Unsure what could be causing this. Trying again with only the mingw jobs to see if those also fail.

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 20, 2025
@bors
Auto merge of rust-lang#137297 - tgross35:update-builtins, r=<try>
9c5e57d 
Update `compiler-builtins` to 0.1.147

Removes an ABI hack that used `<2 x i64>` to return `i128` in `xmm0` on Windows [1].

[1]: rust-lang/compiler-builtins#759
Link: rust-lang#116558
Link: rust-lang/compiler-builtins#758

try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
@bors
Copy link
Contributor

bors commented Feb 20, 2025

⌛ Trying commit e80f1a4 with merge 9c5e57d...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Feb 20, 2025

💔 Test failed - checks-actions

@tgross35
Copy link
Contributor Author

Maybe stage0 hasn't gotten bumped to something that would include #134290 yet?

@tgross35
Copy link
Contributor Author

tgross35 commented Feb 20, 2025 •
edited
Loading

Indeed #137237

@rustbot blocked

@rustbot rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 20, 2025
@RalfJung
Copy link
Member

Hm. Looking at both the asm and llvm ir for the symbols previously marked with win64_128bit_abi_hack, the only difference I see is <16 x i8> vs <2 x i64> for the return type.

That's expected; when we set a PassMode to pass things in Vector registers, we always generate i8 vectors. We rely on this making no difference for LLVM.

@RalfJung
Copy link
Member

Oh, I misunderstood. Yeah this needs #134290 in the bootstrap compiler, you are right. :)

@bors
Copy link
Contributor

bors commented Feb 23, 2025

☔ The latest upstream changes (presumably #137446) made this pull request unmergeable. Please resolve the merge conflicts.

@tgross35 tgross35 closed this Feb 23, 2025
@tgross35
Update compiler-builtins to 0.1.147
08f1086 
Removes an ABI hack that used `<2 x i64>` to return `i128` in `xmm0` on
Windows [1].

[1]: rust-lang/compiler-builtins#759
Link: rust-lang#116558
Link: rust-lang/compiler-builtins#758
@tgross35 tgross35 reopened this Feb 23, 2025
@tgross35 tgross35 closed this Feb 23, 2025
@tgross35 tgross35 reopened this Feb 23, 2025
@RalfJung
Copy link
Member

The bootstrap bump landed, so I guess this should work now? AFAIK try merges with latest master so let's see

@bors try

@bors
Copy link
Contributor

bors commented Feb 23, 2025

⌛ Trying commit 08f1086 with merge 3c8cffe...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 23, 2025
@bors
Auto merge of rust-lang#137297 - tgross35:update-builtins, r=<try>
3c8cffe 
Update `compiler-builtins` to 0.1.147

Removes an ABI hack that used `<2 x i64>` to return `i128` in `xmm0` on Windows [1].

[1]: rust-lang/compiler-builtins#759
Link: rust-lang#116558
Link: rust-lang/compiler-builtins#758

try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
@bors
Copy link
Contributor

bors commented Feb 23, 2025

☀️ Try build successful - checks-actions
Build commit: 3c8cffe (3c8cffe849b99a650f1ce7f7dd43e87d88321dbe)

@tgross35
Copy link
Contributor Author

Woo!

@bors r+

@bors
Copy link
Contributor

bors commented Feb 23, 2025

📌 Commit 08f1086 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-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Feb 23, 2025
@tgross35 tgross35 mentioned this pull request Feb 23, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 23, 2025
@bors
Auto merge of rust-lang#137497 - tgross35:rollup-1oeclrr, r=tgross35
246632c 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#136439 (Misc. `rustc_codegen_ssa` cleanups 🧹)
 - rust-lang#136543 (intrinsics: unify rint, roundeven, nearbyint in a single round_ties_even intrinsic)
 - rust-lang#136637 (Add binary_format to rustc target specs)
 - rust-lang#137099 (Fix rustdoc test directives that were accidentally ignored 🧐)
 - rust-lang#137297 (Update `compiler-builtins` to 0.1.147)
 - rust-lang#137451 (FIx `sym` -> `syn` typo in tail-expr-drop-order type opt-out)
 - rust-lang#137452 (bootstrap: add module docs for core:metadata)
 - rust-lang#137483 (rename sub_ptr to offset_from_unsigned)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 23, 2025
@bors
Auto merge of rust-lang#137497 - tgross35:rollup-1oeclrr, r=tgross35
9af8985 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#136439 (Misc. `rustc_codegen_ssa` cleanups 🧹)
 - rust-lang#136543 (intrinsics: unify rint, roundeven, nearbyint in a single round_ties_even intrinsic)
 - rust-lang#136637 (Add binary_format to rustc target specs)
 - rust-lang#137099 (Fix rustdoc test directives that were accidentally ignored 🧐)
 - rust-lang#137297 (Update `compiler-builtins` to 0.1.147)
 - rust-lang#137451 (FIx `sym` -> `syn` typo in tail-expr-drop-order type opt-out)
 - rust-lang#137452 (bootstrap: add module docs for core:metadata)
 - rust-lang#137483 (rename sub_ptr to offset_from_unsigned)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fb54acd into rust-lang:master Feb 24, 2025
8 of 16 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 24, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 24, 2025
@rust-timer
Unrolled build for rust-lang#137297
bcaaa81 
Rollup merge of rust-lang#137297 - tgross35:update-builtins, r=tgross35

Update `compiler-builtins` to 0.1.147

Removes an ABI hack that used `<2 x i64>` to return `i128` in `xmm0` on Windows [1].

[1]: rust-lang/compiler-builtins#759
Link: rust-lang#116558
Link: rust-lang/compiler-builtins#758

try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.87.0
Development

Successfully merging this pull request may close these issues.
5 participants
@tgross35 @rustbot @bors @rust-log-analyzer @RalfJung