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

Split critical edge targeting the start block #88124

Merged
merged 1 commit into from
Aug 19, 2021
Merged

Split critical edge targeting the start block #88124

merged 1 commit into from
Aug 19, 2021

Conversation

tmiasko
Copy link
Contributor

@tmiasko tmiasko commented Aug 17, 2021 •
edited
Loading

Fixes #88043.

@rust-highfive
Copy link
Collaborator

r? @oli-obk

(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 Aug 17, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Aug 17, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Aug 17, 2021

📌 Commit 9a0ee05 has been approved by oli-obk

@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 17, 2021
@wesleywiser
Copy link
Member

@bors p=1

Fixes stable-to-stable regression

@bors
Copy link
Contributor

bors commented Aug 19, 2021

⌛ Testing commit 9a0ee05 with merge 2451f42...

@bors
Copy link
Contributor

bors commented Aug 19, 2021

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 2451f42 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 19, 2021
@bors bors merged commit 2451f42 into rust-lang:master Aug 19, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 19, 2021
@tmiasko tmiasko deleted the start-block-critical-edge branch August 19, 2021 17:25
@wesleywiser
Copy link
Member

Since this is a stable-to-stable regression, nominating for backport.

@wesleywiser wesleywiser added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 19, 2021
@erikdesjardins erikdesjardins mentioned this pull request Aug 20, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 20, 2021
@bors
Auto merge of rust-lang#88176 - erikdesjardins:rezst, r=oli-obk
914a1e2 
Reenable RemoveZsts

Now that the underlying issue has been fixed by rust-lang#88124, we can reland rust-lang#83417.

r? `@oli-obk`
@apiraino
Copy link
Contributor

Backport accepted for beta and stable as per compiler team on Zulip

@rustbot label +beta-accepted +stable-accepted

@rustbot rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Aug 26, 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
@pietroalbini pietroalbini removed stable-nominated Nominated for backporting to the compiler in the stable channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Jan 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.

LLVM crash: Basic Block does not have terminator!
9 participants
@tmiasko @rust-highfive @oli-obk @bors @wesleywiser @apiraino @pietroalbini @Mark-Simulacrum @rustbot