Skip to content

stdlib: Enable upcoming MemberImportVisibility feature #76665

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.

Sign up for GitHub

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 2 commits into from
Nov 18, 2024
Merged

stdlib: Enable upcoming MemberImportVisibility feature #76665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0b7166
Driver: Pass -disable-upcoming-feature and -disable-experimental-feat…
tshortli Nov 18, 2024
c9c3673
stdlib: Enable upcoming MemberImportVisibility feature.
tshortli Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/Driver/ToolChains.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,10 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
inputArgs.AddLastArg(arguments, options::OPT_disable_dynamic_actor_isolation);
inputArgs.AddLastArg(arguments, options::OPT_warn_concurrency);
inputArgs.AddLastArg(arguments, options::OPT_strict_concurrency);
inputArgs.AddAllArgs(arguments, options::OPT_enable_experimental_feature);
inputArgs.AddAllArgs(arguments, options::OPT_enable_upcoming_feature);
inputArgs.addAllArgs(arguments, {options::OPT_enable_experimental_feature,
options::OPT_disable_experimental_feature,
options::OPT_enable_upcoming_feature,
options::OPT_disable_upcoming_feature});
inputArgs.AddLastArg(arguments, options::OPT_warn_implicit_overrides);
inputArgs.AddLastArg(arguments, options::OPT_typo_correction_limit);
inputArgs.AddLastArg(arguments, options::OPT_enable_app_extension);
Expand Down
4 changes: 1 addition & 3 deletions stdlib/cmake/modules/SwiftSource.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,10 +633,8 @@ function(_compile_swift_files
list(APPEND swift_flags "-enable-experimental-feature" "SuppressedAssociatedTypes")
list(APPEND swift_flags "-enable-experimental-feature" "SE427NoInferenceOnExtension")
list(APPEND swift_flags "-enable-experimental-feature" "AllowUnsafeAttribute")

list(APPEND swift_flags "-enable-experimental-feature" "NonescapableTypes")

list(APPEND swift_flags "-enable-experimental-feature" "ExtensionImportVisiblity")
list(APPEND swift_flags "-enable-upcoming-feature" "MemberImportVisibility")

if (SWIFT_STDLIB_ENABLE_STRICT_CONCURRENCY_COMPLETE)
list(APPEND swift_flags "-strict-concurrency=complete")
Expand Down
5 changes: 5 additions & 0 deletions stdlib/public/Cxx/std/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_O
-Xfrontend -module-interface-preserve-types-as-written
-enable-experimental-feature AssumeResilientCxxTypes

# The varying modularization of the C++ standard library on different
# platforms makes it difficult to enable MemberImportVisibility for this
# module
-disable-upcoming-feature MemberImportVisibility

SWIFT_COMPILE_FLAGS_LINUX
${SWIFT_SDK_LINUX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}

Expand Down
18 changes: 18 additions & 0 deletions test/Driver/features.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// RUN: %swiftc_driver -emit-executable -o %t.exe %s \
// RUN: -enable-upcoming-feature MemberImportVisibility \
// RUN: -enable-experimental-feature ParserValidation \
// RUN: -disable-upcoming-feature MemberImportVisibility \
// RUN: -disable-experimental-feature ParserValidation \
// RUN: -disallow-use-new-driver -driver-print-jobs 2>&1 | %FileCheck %s

// The new driver has its own test for this

// REQUIRES: cplusplus_driver
// REQUIRES: swift_feature_ParserValidation
// REQUIRES: swift_feature_MemberImportVisibility

// CHECK: {{.*}}swift{{c|-frontend}}{{(.exe)?"?}} -frontend
// CHECK-SAME: -enable-upcoming-feature MemberImportVisibility
// CHECK-SAME: -enable-experimental-feature ParserValidation
// CHECK-SAME: -disable-upcoming-feature MemberImportVisibility
// CHECK-SAME: -disable-experimental-feature ParserValidation