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

[rebranch] Various changes to get rebranch compiling after taking new clang branch #74851

Merged
merged 15 commits into from
Jul 3, 2024

Conversation

bnbarham
Copy link
Contributor

No description provided.

@bnbarham
Copy link
Contributor Author

@egorzhdan and @beccadax for clang importer changes.

@aschwaighofer for IRGen/SIL.

@bnbarham
Copy link
Contributor Author

swiftlang/llvm-project#8938

@swift-ci please test

@bnbarham bnbarham force-pushed the rebranch-build-after-branch branch from ffc2864 to 35fd6c7 Compare July 1, 2024 21:55
@bnbarham
Copy link
Contributor Author

bnbarham commented Jul 1, 2024

swiftlang/llvm-project#8938

@swift-ci please test

@bnbarham bnbarham force-pushed the rebranch-build-after-branch branch from 35fd6c7 to fc95999 Compare July 1, 2024 22:37
@bnbarham
Copy link
Contributor Author

bnbarham commented Jul 1, 2024

swiftlang/llvm-project#8938

@swift-ci please test

1 similar comment
@bnbarham
Copy link
Contributor Author

bnbarham commented Jul 2, 2024

swiftlang/llvm-project#8938

@swift-ci please test

Copy link
Contributor

@egorzhdan egorzhdan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ClangImporter changes LGTM

bnbarham added 8 commits July 2, 2024 16:13
`getSelector` now takes a `const clang::IdentifierInfo *` `ArrayRef`.
Sprinkle a bunch of `const`s in.
`Sema` was split up in LLVM upstream 31a203fa8af47a8b2e8e357857b114cf90638b2eq.
Use `FeatureName` rather than `first`.
There were a number of upstream LLVM changes to `DeclID` in order to
separate "local" and "global" IDs:
llvm/llvm-project@07b1177
llvm/llvm-project@b8e3b2a
llvm/llvm-project@b467c6b
llvm/llvm-project#89873
llvm/llvm-project@d86cc73
llvm/llvm-project@8af8602
... and probably more.

This likely needs further cleaning up to not use `DeclID` at all.
Remove `deque` from files it isn't actually used in. Add it and `stack`
to files that it is - presumably they were previously transitively found
through other includes.
@bnbarham bnbarham force-pushed the rebranch-build-after-branch branch from fc95999 to aa7a3a8 Compare July 2, 2024 23:14
@bnbarham bnbarham requested a review from artemcm as a code owner July 2, 2024 23:14
@bnbarham
Copy link
Contributor Author

bnbarham commented Jul 2, 2024

swiftlang/llvm-project#8938

@swift-ci please test

1 similar comment
@bnbarham
Copy link
Contributor Author

bnbarham commented Jul 3, 2024

swiftlang/llvm-project#8938

@swift-ci please test

@bnbarham
Copy link
Contributor Author

bnbarham commented Jul 3, 2024

Heaps more failures than when I checked next a couple weeks ago :(. As far as I can tell mostly caused by:
llvm/llvm-project#93873
and
llvm/llvm-project#91724

@bnbarham bnbarham merged commit 4c5284f into swiftlang:rebranch Jul 3, 2024
0 of 3 checks passed
@bnbarham bnbarham deleted the rebranch-build-after-branch branch July 3, 2024 05:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants