Skip to content

Conversation

michaelwoerister
Copy link
Member

This PR makes rustc emit an error when trying use PGO in conjunction with -Cpanic=unwind on Windows, isn't supported by LLVM yet. The error messages points to #61002, which documents this known limitation.

@rust-highfive
Copy link
Contributor

r? @zackmdavis

(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 May 21, 2019
@zackmdavis
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 21, 2019

📌 Commit dd94dc3 has been approved by zackmdavis

@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 May 21, 2019
Centril added a commit to Centril/rust that referenced this pull request May 21, 2019
…unwind, r=zackmdavis

Emit error when trying to use PGO in conjunction with unwinding on Windows.

This PR makes `rustc` emit an error when trying use PGO in conjunction with `-Cpanic=unwind` on Windows, isn't supported by LLVM yet. The error messages points to rust-lang#61002, which documents this known limitation.
@Centril
Copy link
Contributor

Centril commented May 21, 2019

Failed in #61016 (comment).

@bors r- rollup=never

@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 May 21, 2019
@zackmdavis
Copy link
Contributor

Thanks, Centril; sorry for making the wrong call re: rollupability.

@michaelwoerister
Copy link
Member Author

I updated the test that broke.

@michaelwoerister
Copy link
Member Author

@zackmdavis, I'm gonna re-submit this to bors since the failing test should be fixed. Feel free to r- if you have any concerns.

@bors r=zackmdavis

@bors
Copy link
Collaborator

bors commented May 23, 2019

📌 Commit c960dbc35057684cd4649ca5ba3ea8e38a3cf6ee has been approved by zackmdavis

@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 May 23, 2019
@bors
Copy link
Collaborator

bors commented May 24, 2019

⌛ Testing commit c960dbc35057684cd4649ca5ba3ea8e38a3cf6ee with merge caeb824d835d265ba994bedb1150fefdc41f6d1e...

@bors
Copy link
Collaborator

bors commented May 24, 2019

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 24, 2019
@michaelwoerister michaelwoerister force-pushed the error-pgo-windows-unwind branch from c960dbc to d75db81 Compare May 27, 2019 13:42
@michaelwoerister
Copy link
Member Author

Next try: @bors r=zackmdavis

@bors
Copy link
Collaborator

bors commented May 27, 2019

📌 Commit d75db81d48a9a9fb5e2ef74f8375128473bcfede has been approved by zackmdavis

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 27, 2019
@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 May 28, 2019
@michaelwoerister michaelwoerister force-pushed the error-pgo-windows-unwind branch from d75db81 to c383936 Compare May 28, 2019 08:11
@michaelwoerister
Copy link
Member Author

Rebased.
@bors r=zackmdavis

@bors
Copy link
Collaborator

bors commented May 28, 2019

📌 Commit c383936b4ba3bbe3c9576004867e2f324c45c4c1 has been approved by zackmdavis

@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 May 28, 2019
@michaelwoerister michaelwoerister force-pushed the error-pgo-windows-unwind branch from c383936 to ebabcf7 Compare May 28, 2019 13:26
@michaelwoerister
Copy link
Member Author

I updated the PR because I was able to confirm that things work as expected on Windows GNU since #61080 was merged. So the PR now only gives a warning for MSVC.

@michaelwoerister
Copy link
Member Author

@bors r=zackmdavis

@bors
Copy link
Collaborator

bors commented May 28, 2019

📌 Commit ebabcf7 has been approved by zackmdavis

@Centril
Copy link
Contributor

Centril commented May 28, 2019

@bors p=1

@bors
Copy link
Collaborator

bors commented May 29, 2019

⌛ Testing commit ebabcf7 with merge cf385e1445efc299b4563c46be6a5fe986d2823d...

@bors
Copy link
Collaborator

bors commented May 29, 2019

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 29, 2019
@michaelwoerister
Copy link
Member Author

Fixed the failing tests.

@bors r=zackmdavis

@bors
Copy link
Collaborator

bors commented May 29, 2019

📌 Commit a19a9e9 has been approved by zackmdavis

@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 May 29, 2019
@bors
Copy link
Collaborator

bors commented May 30, 2019

⌛ Testing commit a19a9e9 with merge c28084a...

bors added a commit that referenced this pull request May 30, 2019
…ackmdavis

Emit error when trying to use PGO in conjunction with unwinding on Windows.

This PR makes `rustc` emit an error when trying use PGO in conjunction with `-Cpanic=unwind` on Windows, isn't supported by LLVM yet. The error messages points to #61002, which documents this known limitation.
@bors
Copy link
Collaborator

bors commented May 30, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: zackmdavis
Pushing c28084a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 30, 2019
@bors bors merged commit a19a9e9 into rust-lang:master May 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants