Define SWIFT_INLINE_NAMESPACE for swiftDemangling inclusions. #1023
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
swiftlang/swift#30733 will begin requiring this in a change that allows the swiftDemangling symbols to be conditionally renamed using an inline namespace so that compiler and runtime symbols don't collide if statically linked in the same binary. The namespace `compiler` was chosen for lldb since that's what would have been used if its build was properly inheriting the public definition from the Swift CMake target.
|
cc @compnerd This doesn't feel great, but since the settings aren't getting inherited automatically, is there a better way to do this aside from repeating the values here? 😕 |
|
Yeah, they would be inherited if there was a unified build. |
|
@swift-ci please test |
|
Everything that goes to llvm-project/swift/master must also be cherry-picked manually to llvm-project/swift/master-next. Please also create a second PR for that. |
JDevlieghere
approved these changes
May 29, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
swiftlang/swift#30733 will begin requiring
this in a change that allows the swiftDemangling symbols to be
conditionally renamed using an inline namespace so that compiler
and runtime symbols don't collide if statically linked in the
same binary.
The namespace
compilerwas chosen for lldb since that's whatwould have been used if its build was properly inheriting the
public definition from the Swift CMake target.