Skip to content

Commit c20a2bf

Browse files
authored
Merge pull request #77559 from swiftlang/egorzhdan/cxxstdlib-resilient
[cxx-interop] Make Cxx and CxxStdlib libraries resilient
2 parents 5ab0385 + 703e479 commit c20a2bf

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

stdlib/public/Cxx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT)
66
list(APPEND SWIFT_CXX_DEPS copy-legacy-layouts)
77
endif()
88

9-
add_swift_target_library(swiftCxx STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY IS_FRAGILE
9+
add_swift_target_library(swiftCxx STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY
1010
CxxConvertibleToBool.swift
1111
CxxConvertibleToCollection.swift
1212
CxxDictionary.swift

stdlib/public/Cxx/std/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ endif()
3333
#
3434
# The overlay is fragile (i.e. it does not use library evolution)
3535
# as it's not ABI stable.
36-
add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY IS_FRAGILE
36+
add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY
3737
std.swift
3838
Chrono.swift
3939
String.swift
@@ -50,6 +50,7 @@ add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_O
5050
SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
5151
-cxx-interoperability-mode=default
5252
-Xfrontend -module-interface-preserve-types-as-written
53+
-enable-experimental-feature AssumeResilientCxxTypes
5354

5455
SWIFT_COMPILE_FLAGS_LINUX
5556
${SWIFT_SDK_LINUX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}

0 commit comments

Comments
 (0)