Skip to content

Fix some divergences with the cg_clif subtree #150341

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
bors merged 1 commit into from
Dec 24, 2025
Merged

Fix some divergences with the cg_clif subtree #150341

bors merged 1 commit into from
Dec 24, 2025
+1 −9

Conversation

@bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Dec 24, 2025

For some reason git-subtree incorrectly synced those changes.

r? @ghost

@rustbot label +A-codegen +A-cranelift +T-compiler

@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. A-codegen Area: Code generation A-cranelift Things relevant to the [future] cranelift backend labels Dec 24, 2025
@bjorn3
Copy link
Member Author

bjorn3 commented Dec 24, 2025

This is effectively a manual subtree sync, so self-approving.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 24, 2025

📌 Commit a3dc0ef has been approved by bjorn3

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 Dec 24, 2025
@bjorn3 bjorn3 mentioned this pull request Dec 24, 2025
Open
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Dec 24, 2025
@JonathanBrouwer
Rollup merge of rust-lang#150341 - bjorn3:fix_cg_clif_divergence, r=b…
240750d 
…jorn3

Fix some divergences with the cg_clif subtree

For some reason git-subtree incorrectly synced those changes.

r? `@ghost`

`@rustbot` label +A-codegen +A-cranelift +T-compiler
@JonathanBrouwer JonathanBrouwer mentioned this pull request Dec 24, 2025
Closed
bors added a commit that referenced this pull request Dec 24, 2025
@bors
Auto merge of #150342 - JonathanBrouwer:rollup-r5g9by1, r=JonathanBro…
8bdb7d3 
…uwer

Rollup of 4 pull requests

Successful merges:

 - #150311 (Avoid using env::temp when linking a binary)
 - #150336 (Disable f16 on LoongArch for LLVM < 21)
 - #150338 (Include rustc version in ICE messages)
 - #150341 (Fix some divergences with the cg_clif subtree)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@JonathanBrouwer
Copy link
Contributor

JonathanBrouwer commented Dec 24, 2025

@bors r-
#150342 (comment)

@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 24, 2025
@bjorn3
Fix some divergences with the cg_clif subtree
a8c9cb5 
For some reason git-subtree incorrectly synced those changes.
@bjorn3 bjorn3 force-pushed the fix_cg_clif_divergence branch from a3dc0ef to a8c9cb5 Compare December 24, 2025 15:17
@bjorn3
Copy link
Member Author

bjorn3 commented Dec 24, 2025

I'm guessing I didn't need rustc_private for mini_core and mini_core_hello_world when building in the cg_clif repo due to -Zforce-unstable-if-unmarked not being passed in that case, causing the const stability checker to behave differently. Reverted those changes.

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 24, 2025

📌 Commit a8c9cb5 has been approved by bjorn3

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 24, 2025
@JonathanBrouwer JonathanBrouwer mentioned this pull request Dec 24, 2025
Merged
bors added a commit that referenced this pull request Dec 24, 2025
@bors
Auto merge of #150351 - JonathanBrouwer:rollup-knpqs9d, r=JonathanBro…
e7d4414 
…uwer

Rollup of 3 pull requests

Successful merges:

 - #150141 (Misc cleanups from reading some borrowck code)
 - #150297 (Fix compile issue in Vita libstd)
 - #150341 (Fix some divergences with the cg_clif subtree)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 990783f into rust-lang:main Dec 24, 2025
11 checks passed
rust-timer added a commit that referenced this pull request Dec 24, 2025
@rust-timer
Unrolled build for #150341
1585f7f 
Rollup merge of #150341 - bjorn3:fix_cg_clif_divergence, r=bjorn3

Fix some divergences with the cg_clif subtree

For some reason git-subtree incorrectly synced those changes.

r? `@ghost`

`@rustbot` label +A-codegen +A-cranelift +T-compiler
@rustbot rustbot added this to the 1.94.0 milestone Dec 24, 2025
@bjorn3 bjorn3 deleted the fix_cg_clif_divergence branch December 24, 2025 19:47
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-codegen Area: Code generation A-cranelift Things relevant to the [future] cranelift backend 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.

Projects

None yet

Milestone

1.94.0

Development

Successfully merging this pull request may close these issues.

5 participants

@bjorn3 @bors @rust-log-analyzer @JonathanBrouwer @rustbot