Skip to content

Define SWIFT_INLINE_NAMESPACE for swiftDemangling inclusions. #1023

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 1 commit into from
May 29, 2020

Conversation

allevato
Copy link
Member

@allevato allevato commented Apr 3, 2020

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.

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.
@allevato
Copy link
Member Author

allevato commented Apr 3, 2020

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? 😕

@compnerd
Copy link
Member

compnerd commented Apr 3, 2020

Yeah, they would be inherited if there was a unified build.

@compnerd
Copy link
Member

compnerd commented Apr 3, 2020

CC: @JDevlieghere @adrian-prantl

@compnerd
Copy link
Member

compnerd commented Apr 3, 2020

@swift-ci please test

@adrian-prantl
Copy link

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 JDevlieghere merged commit 70ea044 into swiftlang:swift/master May 29, 2020
@allevato allevato deleted the swift-demangling-dep branch May 29, 2020 19:12
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