Skip to content

[rebranch] Push stable/20240408 changes to next #8819

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
merged 15 commits into from
Jun 5, 2024

Conversation

bnbarham
Copy link

Push all the current stable/20240408 changes up to next in preparation for the next branch. This is mostly LLDB, but also takes a few reverts that keep happening on stable.

@adrian-prantl @JDevlieghere for the LLDB changes
@etcwilde for re-exposing GTest
@aschwaighofer for the getLoopPreheader change (this should probably be upstreamed)
@al45tair for Swift triple
@egorzhdan for the cxx-interop workaround
@jroelofs for the revert of "Cleanup unwind table emission code a bit."

bnbarham and others added 15 commits May 30, 2024 09:21
`StreamFile.h` moved from `lldb/Core` to `lldb/Host`. Update Swift
references.

(cherry picked from commit a1f9c2f)
`eManglingSchemeSwift` is not guarded by `LLDB_ENABLE_SWIFT`, so a case
was added upstream. Remove the now duplicated case statement.

(cherry picked from commit fb74e31)
Seems there's a `SetTriple` on the context itself now.

(cherry picked from commit 2c67baf)
LLVM hid GTest from folks that aren't building as part of LLVM, or that
aren't installing GTest. While this is the right thing to do and is
totally sensible, it doesn't work with Swift, which does neither.
Re-expose GTest for now. This should get cleaned up once Swift builds
things reasonably.

(cherry picked from commit ade5638)
There's no reason to require random access on downstream clients here.

(cherry picked from commit 355f86e)
We want this so we can uniquely identify our fully-static Linux
target using a triple (since we wish to make decisions about it in
the compiler driver that wouldn't be appropriate for an "unknown"
triple).

rdar://123436421
(cherry picked from commit 18ba856)
```
<unknown>:0: error: calling a private constructor of class 'clang::StmtIterator'
swift/llvm-project/clang/include/clang/AST/StmtIterator.h:137:3: note: declared private here
  StmtIterator(const StmtIteratorBase &RHS)
  ^
```

rdar://113514872
(cherry picked from commit f7b421f)
This reverts commit 648ce3d.

rdar://113994760
llvm#64826
(cherry picked from commit 1c7f71c)
Temporarily reverts commit 4e0275a to
unblock swift's rebranch build, which currently passes `-arch`
unconditionally.

(cherry picked from commit 201e84d)
@bnbarham
Copy link
Author

@swift-ci please test llvm

Copy link

@JDevlieghere JDevlieghere left a comment

Choose a reason for hiding this comment

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

LLDB LGTM

Copy link

@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.

The C++ interop bit LGTM

Copy link

@al45tair al45tair left a comment

Choose a reason for hiding this comment

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

Swift triple looks fine. Haven't reviewed the rest.

Copy link

@jroelofs jroelofs left a comment

Choose a reason for hiding this comment

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

picking the EH cleanup revert LGTM

@bnbarham
Copy link
Author

bnbarham commented Jun 4, 2024

@swift-ci please test llvm

Copy link

@etcwilde etcwilde left a comment

Choose a reason for hiding this comment

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

Re-exposing GTEST looks fine to me.

@bnbarham
Copy link
Author

bnbarham commented Jun 4, 2024

@aschwaighofer okay with 141bce5?

@bnbarham bnbarham merged commit c3ce78d into swiftlang:next Jun 5, 2024
2 checks passed
@bnbarham bnbarham deleted the cherry-rebranch-to-next branch June 5, 2024 20:19
@bnbarham
Copy link
Author

bnbarham commented Jun 5, 2024

PR to upstream that change: llvm#94540

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.

6 participants