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 fix i128 shift/mul on thumbv6m #87633

Merged
merged 1 commit into from
Aug 2, 2021
Merged

Update compiler_builtins to fix i128 shift/mul on thumbv6m #87633

merged 1 commit into from
Aug 2, 2021

Conversation

Amanieu
Copy link
Member

@Amanieu Amanieu commented Jul 30, 2021

Fixes #86063

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 30, 2021
@Amanieu
Copy link
Member Author

Amanieu commented Jul 30, 2021

Unfortunately the bug that this fixes has its way into stable already. But we should still consider backporting it to beta at least.

@Mark-Simulacrum Mark-Simulacrum added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 1, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+

Beta nominated, but not sure who should decide on that. Seems like a pretty harmless patch - Diff between the two versions here, I think: https://github.com/rust-lang/compiler-builtins/compare/0.1.47..0.1.49

@bors
Copy link
Contributor

bors commented Aug 1, 2021

📌 Commit 12017f9 has been approved by Mark-Simulacrum

@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 Aug 1, 2021
@JohnTitor JohnTitor mentioned this pull request Aug 2, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 2, 2021
@bors
Auto merge of rust-lang#87689 - JohnTitor:rollup-ns38b56, r=JohnTitor
effea9a 
Rollup of 13 pull requests

Successful merges:

 - rust-lang#86183 (Change environment variable getters to error recoverably)
 - rust-lang#86439 (Remove `Ipv4Addr::is_ietf_protocol_assignment`)
 - rust-lang#86509 (Move `os_str_bytes` to `sys::unix`)
 - rust-lang#86593 (Partially stabilize `const_slice_first_last`)
 - rust-lang#86936 (Add documentation for `Ipv6MulticastScope`)
 - rust-lang#87282 (Ensure `./x.py dist` adheres to `build.tools`)
 - rust-lang#87468 (Update rustfmt)
 - rust-lang#87504 (Update mdbook.)
 - rust-lang#87608 (Remove unused field `Session.system_library_path`)
 - rust-lang#87629 (Consistent spelling of "adapter" in the standard library)
 - rust-lang#87633 (Update compiler_builtins to fix i128 shift/mul on thumbv6m)
 - rust-lang#87644 (Recommend `swap_remove` in `Vec::remove` docs)
 - rust-lang#87653 (mark a UB doctest as no_run)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e924e76 into rust-lang:master Aug 2, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 2, 2021
@apiraino
Copy link
Contributor

apiraino commented Aug 5, 2021

Let's talk about this beta nom on T-compiler meeting

@rustbot label +T-compiler

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 5, 2021
@pnkfelix pnkfelix added the stable-nominated Nominated for backporting to the compiler in the stable channel. label Aug 5, 2021
@apiraino
Copy link
Contributor

apiraino commented Aug 5, 2021

Beta backport accepted as per compiler team on Zulip

Stable backport declined.

@rustbot label +beta-accepted -stable-nominated

@rustbot rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed stable-nominated Nominated for backporting to the compiler in the stable channel. labels Aug 5, 2021
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 27, 2021
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.56.0, 1.55.0 Aug 27, 2021
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Aug 27, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 28, 2021
@bors
Auto merge of rust-lang#88400 - Mark-Simulacrum:beta-next, r=Mark-Sim…
27e88d3 
…ulacrum

[beta] backports

This PR rolls up a number of beta backports:

* Split critical edge targeting the start block rust-lang#88124
* Make BuildHasher object safe rust-lang#88031
* Fix Windows Command::env("PATH") rust-lang#87863
* Do not ICE on HIR based WF check when involving lifetimes rust-lang#87811
* Update compiler_builtins to fix i128 shift/mul on thumbv6m rust-lang#87633
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.55.0
7 participants
@Amanieu @rust-highfive @Mark-Simulacrum @bors @apiraino @pnkfelix @rustbot