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.

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

Fix chaining carrying_adds #133674

Merged
merged 1 commit into from
Dec 1, 2024
Merged

Conversation

scottmcm
Copy link
Member

Something about the MIR lowering for || ended up breaking this, but it's fixed by changing the code to use | instead.

I also added an assembly test to ensure it keeps being adc.

cc #85532 (comment), which noticed this.

@rustbot
Copy link
Collaborator

rustbot commented Nov 30, 2024

r? @Amanieu

rustbot has assigned @Amanieu.
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-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. labels Nov 30, 2024
@rust-log-analyzer

This comment has been minimized.

Something about the MIR lowering for `||` ended up breaking this, but it's fixed by changing the code to use `|` instead.

I also added an assembly test to ensure it *keeps* being `adc`.
@Amanieu
Copy link
Member

Amanieu commented Nov 30, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Nov 30, 2024

📌 Commit 9836196 has been approved by Amanieu

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 Nov 30, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 1, 2024
…nieu

Fix chaining `carrying_add`s

Something about the MIR lowering for `||` ended up breaking this, but it's fixed by changing the code to use `|` instead.

I also added an assembly test to ensure it *keeps* being [`adc`](https://www.felixcloutier.com/x86/adc).

cc rust-lang#85532 (comment), which noticed this.
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 1, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128004 (codegen `#[naked]` functions using global asm)
 - rust-lang#132974 (Properly pass linker arguments that contain commas)
 - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`)
 - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+)
 - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items)
 - rust-lang#133669 (Move some functions out of const_swap feature gate)
 - rust-lang#133674 (Fix chaining `carrying_add`s)
 - rust-lang#133691 (Check let source before suggesting annotation)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 1, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#132974 (Properly pass linker arguments that contain commas)
 - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`)
 - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+)
 - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items)
 - rust-lang#133669 (Move some functions out of const_swap feature gate)
 - rust-lang#133674 (Fix chaining `carrying_add`s)
 - rust-lang#133691 (Check let source before suggesting annotation)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 1, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#132974 (Properly pass linker arguments that contain commas)
 - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`)
 - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+)
 - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items)
 - rust-lang#133669 (Move some functions out of const_swap feature gate)
 - rust-lang#133674 (Fix chaining `carrying_add`s)
 - rust-lang#133691 (Check let source before suggesting annotation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2f00feb into rust-lang:master Dec 1, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 1, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 1, 2024
Rollup merge of rust-lang#133674 - scottmcm:chain-carrying-add, r=Amanieu

Fix chaining `carrying_add`s

Something about the MIR lowering for `||` ended up breaking this, but it's fixed by changing the code to use `|` instead.

I also added an assembly test to ensure it *keeps* being [`adc`](https://www.felixcloutier.com/x86/adc).

cc rust-lang#85532 (comment), which noticed this.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 3, 2024
Update the definition of `borrowing_sub`

Complementary PR to rust-lang#133674, which only updated `carrying_add`.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 3, 2024
Rollup merge of rust-lang#133796 - TDecking:borrowing-sub, r=tgross35

Update the definition of `borrowing_sub`

Complementary PR to rust-lang#133674, which only updated `carrying_add`.
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Dec 4, 2024
Update the definition of `borrowing_sub`

Complementary PR to rust-lang/rust#133674, which only updated `carrying_add`.
@scottmcm scottmcm deleted the chain-carrying-add branch December 22, 2024 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants