Skip to content

Cherry-pick some lldb changes to stable/20230725 #7124

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

Merged

Conversation

bulbazord
Copy link

These are all the patches I've landed upstream since the branch. I'll need these in the future, so cherry-picking them now when it's low-risk and low-effort seems like the reasonable thing to do.

This commit does a few related things:
- Removes unused function `uuid_is_null`
- Removes unneeded includes of UuidCompatibility.h
- Renames UuidCompatibility to AppleUuidCompatibility and adds a comment
  to clarify intent of header.
- Moves AppleUuidCompatibility to the include directory

Differential Revision: https://reviews.llvm.org/D156562

(cherry picked from commit db9087a)
In a809720 I refactored some logic to
deal with the clang resource directory in standalone LLDB builds.
However, this logic escaped me because it only runs when you do not
build LLDB.framework.

Differential Revision: https://reviews.llvm.org/D156763

(cherry picked from commit 6888de1)
I noticed these were missing.

Differential Revision: https://reviews.llvm.org/D156764

(cherry picked from commit b8aba26)
@bulbazord bulbazord merged commit 3b61070 into swiftlang:stable/20230725 Aug 1, 2023
@bulbazord bulbazord deleted the 20230725-cherry-picks branch August 1, 2023 17:58
@bulbazord bulbazord restored the 20230725-cherry-picks branch August 1, 2023 19:08
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.

1 participant