[CMake] Use separate namespace for demangling symbols used by runtime #78490
Conversation
|
@swift-ci please smoke test |
Runtimes/Core/CMakeLists.txt
Outdated
| # the inline namespace to distinguish symbols from those built for the | ||
| # compiler, in order to avoid possible ODR violations if both are statically | ||
| # linked into the same binary. (see also commit message for 5b1daa9055c99904c84862ecc313641fd9b26e63) | ||
| $<$<COMPILE_LANGUAGE:C,CXX>:-DSWIFT_INLINE_NAMESPACE=__runtime> # Demangling, runtime, Concurrency, RemoteInspection, SwiftRemoteMirror, swift-reflection-test |
There was a problem hiding this comment.
Since this is only needed by things that pull in libDemangling, we should make this a PUBLIC define coming from the libDemangling library. Then anything that links Demangling will pick up the appropriate setting.
There was a problem hiding this comment.
Thanks for the guidance -- I admit I blindly matched the existing code, without seeing its underlying purpose and translating it to proper modern CMake patterns.
There was a problem hiding this comment.
This global stash of definitions should eventually have the definition attached to the appropriate libraries. This was mostly for expedience when deciphering the logic in add_swift_target_library was taking too long.
This matches the behavior introduced with swiftlang#30733 -- quoting the explanation here for the sake of convenience: > Since libDemangling is included in the Swift standard library, > ODR violations can occur on platforms that allow statically > linking stdlib if Swift code is linked with other compiler > libraries that also transitively pull in libDemangling, and if > the stdlib version and compiler version do not match exactly > (even down to commit drift between releases). This lets the > runtime conditionally segregate its copies of the libDemangling > symbols from those in the compiler using an inline namespace > without affecting usage throughout source. Addresses rdar://142550635
edymtt
force-pushed
the
edymtt/set-swift-inline-namespace-for-core
branch
from
00a01e8 to
d546222
Compare
|
@swift-ci please smoke test |
This matches the behavior introduced with #30733 -- quoting the
explanation here for the sake of convenience:
Addresses rdar://142550635