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

llvm-16: Use Triple.h from new header location. #107764

Merged
merged 1 commit into from
Feb 8, 2023
Merged

llvm-16: Use Triple.h from new header location. #107764

merged 1 commit into from
Feb 8, 2023

Conversation

maurer
Copy link
Contributor

@maurer maurer commented Feb 7, 2023

LLVM 16 has moved Triple.h from ADT and into TargetParser.

LLVM landed a commit this morning moving the header. This change should make rustc continue to build against LLVM main.

@maurer
llvm-16: Use Triple.h from new header location.
147c51e 
LLVM 16 has moved Triple.h from ADT and into TargetParser
@rustbot
Copy link
Collaborator

rustbot commented Feb 7, 2023

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 Feb 7, 2023
@maurer
Copy link
Contributor Author

maurer commented Feb 7, 2023

@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 Feb 7, 2023
@cuviper
Copy link
Member

cuviper commented Feb 7, 2023

Just to clarify, since I was confused at first why you didn't make this LLVM 17 for current main -- LLVM 16 already moved the contents to TargetParser/Triple.h, but kept ADT/Triple.h as a shim header that only included the new location. The new commit on main (17) removed that ADT shim, but we can go ahead and transition to the new header even on 16.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 7, 2023

📌 Commit 147c51e 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 Feb 7, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 7, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 7, 2023
@bors
Auto merge of rust-lang#107768 - matthiaskrgr:rollup-9u4cal4, r=matth…
3f059f6 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#107719 (Remove `arena_cache` modifier from `upstream_monomorphizations_for`)
 - rust-lang#107740 (Avoid locking the global context across the `after_expansion` callback)
 - rust-lang#107746 (Split fn_ctxt/adjust_fulfillment_errors from fn_ctxt/checks)
 - rust-lang#107749 (allow quick-edit convenience)
 - rust-lang#107750 (make more readable)
 - rust-lang#107755 (remove binder from query constraints)
 - rust-lang#107756 (miri: fix ICE when running out of address space)
 - rust-lang#107764 (llvm-16: Use Triple.h from new header location.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 232213d into rust-lang:master Feb 8, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

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
Milestone
1.69.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@maurer @rustbot @cuviper @bors