Skip to content

Commit f9dceaa

Browse files
committed
stdlib: Enable upcoming MemberImportVisibility feature.
It was already supposed to be enabled, but I forgot to update the CMake when I renamed the feature from ExtensionImportVisibility to MemberImportVisibility. However, leave it disabled on the Cxx module since the C++ standard library's modularization varies a lot by platform, making it difficult to add the right conditional imports.
1 parent 0889142 commit f9dceaa

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

stdlib/cmake/modules/SwiftSource.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -633,10 +633,8 @@ function(_compile_swift_files
633633
list(APPEND swift_flags "-enable-experimental-feature" "SuppressedAssociatedTypes")
634634
list(APPEND swift_flags "-enable-experimental-feature" "SE427NoInferenceOnExtension")
635635
list(APPEND swift_flags "-enable-experimental-feature" "AllowUnsafeAttribute")
636-
637636
list(APPEND swift_flags "-enable-experimental-feature" "NonescapableTypes")
638-
639-
list(APPEND swift_flags "-enable-experimental-feature" "ExtensionImportVisiblity")
637+
list(APPEND swift_flags "-enable-upcoming-feature" "MemberImportVisibility")
640638

641639
if (SWIFT_STDLIB_ENABLE_STRICT_CONCURRENCY_COMPLETE)
642640
list(APPEND swift_flags "-strict-concurrency=complete")

stdlib/public/Cxx/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ add_swift_target_library(swiftCxx STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY
2525
# For functionality that depends on the C++ stdlib, use C++ stdlib overlay (`swiftstd` module).
2626
-Xcc -nostdinc++
2727

28+
# The varying modularization of the C++ standard library on different
29+
# platforms makes it difficult to enable MemberImportVisibility for this
30+
# module
31+
-disable-upcoming-feature MemberImportVisibility
32+
2833
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
2934

3035
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

stdlib/public/Cxx/std/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_O
5252
-Xfrontend -module-interface-preserve-types-as-written
5353
-enable-experimental-feature AssumeResilientCxxTypes
5454

55+
# The varying modularization of the C++ standard library on different
56+
# platforms makes it difficult to enable MemberImportVisibility for this
57+
# module
58+
-disable-upcoming-feature MemberImportVisibility
59+
5560
SWIFT_COMPILE_FLAGS_LINUX
5661
${SWIFT_SDK_LINUX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}
5762

0 commit comments

Comments
 (0)