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

llvm-wrapper: adapt for LLVM API changes #105555

Merged
merged 1 commit into from
Dec 12, 2022

Conversation

krasimirgg
Copy link
Contributor

This is a follow-up of 75aec47. There, I updated the wrapper to only include llvm/ADT/Optional.h for LLVM version below 16. But I missed updating some of the None references.

Found by our experimental rust + llvm at HEAD bot: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/15587#0185006b-e0af-49e5-8b06-280ed125ff0d/200-539

This is a follow-up of
rust-lang@75aec47.
There, I updated the wrapper to only include llvm/ADT/Optional.h for
LLVM version below 16. But I missed updating some of the None references.

Found by our experimental rust + llvm at HEAD bot:
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/15587#0185006b-e0af-49e5-8b06-280ed125ff0d/200-539
@rustbot
Copy link
Collaborator

rustbot commented Dec 11, 2022

r? @cuviper

(rustbot has picked a reviewer for you, use r? to override)

@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. labels Dec 11, 2022
@krasimirgg
Copy link
Contributor Author

@rustbot label: +llvm-main

@rustbot rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Dec 11, 2022
@cuviper
Copy link
Member

cuviper commented Dec 11, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 11, 2022

📌 Commit cbdc00f has been approved by cuviper

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 Dec 11, 2022
@bjorn3
Copy link
Member

bjorn3 commented Dec 11, 2022

Did you intend to approve a PR still in draft mode?

@cuviper
Copy link
Member

cuviper commented Dec 11, 2022

Oh, I didn't notice that... It looks fine to me, but I'll wait for it to be marked ready.

@bors r-

@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 Dec 11, 2022
@krasimirgg krasimirgg marked this pull request as ready for review December 11, 2022 20:56
@krasimirgg
Copy link
Contributor Author

Marked ready.

@cuviper
Copy link
Member

cuviper commented Dec 11, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 11, 2022

📌 Commit cbdc00f has been approved by cuviper

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 11, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2022
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#101648 (Better documentation for env::home_dir()'s broken behaviour)
 - rust-lang#105283 (Don't call `diagnostic_hir_wf_check` query if we have infer variables)
 - rust-lang#105369 (Detect spurious ; before assoc fn body)
 - rust-lang#105472 (Make encode_info_for_trait_item use queries instead of accessing the HIR)
 - rust-lang#105521 (separate heading from body)
 - rust-lang#105555 (llvm-wrapper: adapt for LLVM API changes)
 - rust-lang#105560 (Extend rustdoc hashtag prepended line test)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 79f99e7 into rust-lang:master Dec 12, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) 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
Development

Successfully merging this pull request may close these issues.

5 participants