Skip to content

Revert "Auto merge of #83417 - erikdesjardins:enableremovezsts, r=oli-obk" #88056

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 2 commits into from
Aug 17, 2021
Merged

Revert "Auto merge of #83417 - erikdesjardins:enableremovezsts, r=oli-obk" #88056

merged 2 commits into from
Aug 17, 2021

Conversation

erikdesjardins
Copy link
Contributor

This reverts commit 8007b50, reversing changes made to e55c13e.

Fixes #88043

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 15, 2021
@erikdesjardins
Copy link
Contributor Author

erikdesjardins commented Aug 15, 2021 •
edited
Loading

No regression test because I can't get this to reproduce under the test harness, I assume I'm missing something obvious...it doesn't error as a codegen test (even with // compile-flags: -Z verify-llvm-ir), nor as a build-pass ui test. But rustc +stage1 src/test/codegen/issue-88043-bb-does-not-have-terminator.rs does error as expected. (Using the original test case from #88043)

@erikdesjardins erikdesjardins mentioned this pull request Aug 15, 2021
Closed
@tmiasko
Copy link
Contributor

tmiasko commented Aug 15, 2021

No regression test because I can't get this to reproduce under the test harness

It requires -Copt-level=0, since otherwise storage markers will be left in the target block following the function call.

@bors
Copy link
Collaborator

bors commented Aug 16, 2021

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

@oli-obk
Copy link
Contributor

oli-obk commented Aug 16, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 16, 2021

📌 Commit b865a76 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 16, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Aug 17, 2021

@bors p=1

@bors
Copy link
Collaborator

bors commented Aug 17, 2021

⌛ Testing commit b865a76 with merge 806b399...

@bors
Copy link
Collaborator

bors commented Aug 17, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 17, 2021
@bors bors merged commit 806b399 into rust-lang:master Aug 17, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 17, 2021
@erikdesjardins erikdesjardins deleted the revertzst branch August 17, 2021 23:55
@Mark-Simulacrum
Copy link
Member

This was a perf regression, but is canceled out due to landing #88176 later in the week.

@rustbot label perf-regression perf-regression-triaged

@rustbot rustbot added perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. labels Aug 25, 2021
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.56.0
Development

Successfully merging this pull request may close these issues.

LLVM crash: Basic Block does not have terminator!
7 participants
@erikdesjardins @tmiasko @bors @oli-obk @Mark-Simulacrum @rust-highfive @rustbot