Skip to content

Prepare to (but does not) enable string processing by default. #42596

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
Apr 23, 2022
Merged

Prepare to (but does not) enable string processing by default. #42596

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
8e19cea
Prepare to enable string processing by default.
rxwei Apr 22, 2022
7244f78
Remove `-disable-implicit-distributed-module-import`.
rxwei Apr 22, 2022
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
4 changes: 0 additions & 4 deletions include/swift/Option/FrontendOptions.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,10 +422,6 @@ def disable_implicit_concurrency_module_import : Flag<["-"],
"disable-implicit-concurrency-module-import">,
HelpText<"Disable the implicit import of the _Concurrency module.">;

def disable_implicit_distributed_module_import : Flag<["-"],
"disable-implicit-distributed-module-import">,
HelpText<"Disable the implicit import of the Distributed module.">;

def disable_implicit_string_processing_module_import : Flag<["-"],
"disable-implicit-string-processing-module-import">,
HelpText<"Disable the implicit import of the _StringProcessing module.">;
Expand Down
4 changes: 3 additions & 1 deletion lib/Frontend/Frontend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,9 @@ bool CompilerInvocation::shouldImportSwiftConcurrency() const {

bool CompilerInvocation::shouldImportSwiftStringProcessing() const {
return getLangOptions().EnableExperimentalStringProcessing &&
!getLangOptions().DisableImplicitStringProcessingModuleImport;
!getLangOptions().DisableImplicitStringProcessingModuleImport &&
getFrontendOptions().InputMode !=
FrontendOptions::ParseInputMode::SwiftModuleInterface;
}

/// Implicitly import the SwiftOnoneSupport module in non-optimized
Expand Down
6 changes: 3 additions & 3 deletions stdlib/cmake/modules/AddSwiftStdlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1754,10 +1754,10 @@ function(add_swift_target_library name)
# Turn off implicit import of _Concurrency when building libraries
list(APPEND SWIFTLIB_SWIFT_COMPILE_FLAGS "-Xfrontend;-disable-implicit-concurrency-module-import")

# Turn off implicit import of Distributed when building libraries
if(SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED)
# Turn off implicit import of _StringProcessing when building libraries
if(SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING)
list(APPEND SWIFTLIB_SWIFT_COMPILE_FLAGS
"-Xfrontend;-disable-implicit-distributed-module-import")
"-Xfrontend;-disable-implicit-string-processing-module-import")
endif()

if(SWIFTLIB_IS_STDLIB AND SWIFT_STDLIB_ENABLE_PRESPECIALIZATION)
Expand Down