Merge pull request #36857 from DougGregor/import-concurrency-by-default-take-2

Enable import of the _Concurrency module by default.

Author: DougGregor

cmake/modules/Libdispatch.cmake

@@ -101,6 +101,14 @@ foreach(sdk ${DISPATCH_SDKS})
                           # ensure that we strip out the DESTDIR environment
                           # from the sub-build
                           ${CMAKE_COMMAND} -E env --unset=DESTDIR ${CMAKE_COMMAND} --build . --target install
+                        COMMAND
+                          ${CMAKE_COMMAND} -E copy
+                          <INSTALL_DIR>/${LIBDISPATCH_RUNTIME_DIR}/${SWIFT_SDK_${sdk}_SHARED_LIBRARY_PREFIX}dispatch${SWIFT_SDK_${sdk}_SHARED_LIBRARY_SUFFIX}
+                          ${SWIFTLIB_DIR}/${SWIFT_SDK_${sdk}_LIB_SUBDIR}/${arch}/${SWIFT_SDK_${sdk}_SHARED_LIBRARY_PREFIX}dispatch${SWIFT_SDK_${sdk}_SHARED_LIBRARY_SUFFIX}
+                        COMMAND
+                          ${CMAKE_COMMAND} -E copy
+                          <INSTALL_DIR>/${LIBDISPATCH_RUNTIME_DIR}/${SWIFT_SDK_${sdk}_SHARED_LIBRARY_PREFIX}BlocksRuntime${SWIFT_SDK_${sdk}_SHARED_LIBRARY_SUFFIX}
+                          ${SWIFTLIB_DIR}/${SWIFT_SDK_${sdk}_LIB_SUBDIR}/${arch}/${SWIFT_SDK_${sdk}_SHARED_LIBRARY_PREFIX}BlocksRuntime${SWIFT_SDK_${sdk}_SHARED_LIBRARY_SUFFIX}
                         STEP_TARGETS
                           install
                         BUILD_BYPRODUCTS

lib/Frontend/Frontend.cpp

@@ -754,9 +754,20 @@ CompilerInstance::openModuleDoc(const InputFile &input) {
   return None;
 }
 
+/// Enable Swift concurrency on a per-target basis
+static bool shouldImportConcurrencyByDefault(const llvm::Triple &target) {
+  if (target.isOSDarwin())
+    return true;
+  if (target.isOSWindows())
+    return true;
+  if (target.isOSLinux())
+    return true;
+  return false;
+}
+
 bool CompilerInvocation::shouldImportSwiftConcurrency() const {
-  return getLangOptions().EnableExperimentalConcurrency
-      && !getLangOptions().DisableImplicitConcurrencyModuleImport &&
+  return shouldImportConcurrencyByDefault(getLangOptions().Target) &&
+      !getLangOptions().DisableImplicitConcurrencyModuleImport &&
       getFrontendOptions().InputMode !=
         FrontendOptions::ParseInputMode::SwiftModuleInterface;
 }

test/Concurrency/async_main_no_concurrency.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -parse-as-library %s
+// RUN: %target-typecheck-verify-swift -parse-as-library -disable-implicit-concurrency-module-import %s
 // RUN: %target-typecheck-verify-swift -parse-as-library -enable-experimental-concurrency -parse-stdlib %s
 
 @main struct Main {

test/Driver/Inputs/android.sdk/usr/lib/swift/android/x86_64/_Concurrency.swiftinterface

@@ -0,0 +1,2 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -target x86_64-unknown-linux-android -disable-objc-interop -swift-version 5 -O -module-name _Concurrency

test/IDE/Inputs/foo_swift_module.printed.comments.txt

@@ -1,4 +1,5 @@
 import SwiftOnoneSupport
+import _Concurrency
 
 func %%% (lhs: Int, rhs: Int) -> Int
 

test/IDE/complete_from_stdlib.swift

@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %target-swift-ide-test -disable-implicit-concurrency-module-import -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
 
 // NO_STDLIB_PRIVATE: Begin completions
 // NO_STDLIB_PRIVATE-NOT: Decl{{[^:]*}}/IsSystem: _

test/IDE/complete_override.swift

@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %target-swift-ide-test -disable-implicit-concurrency-module-import -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
 // RUN: sed -n -e '1,/NO_ERRORS_UP_TO_HERE$/ p' %s > %t_no_errors.swift
 // RUN: %target-swift-frontend -typecheck -verify -disable-objc-attr-requires-foundation-module -enable-objc-interop %t_no_errors.swift
 

test/IRGen/ELF-remove-autolink-section.swift

@@ -1,11 +1,11 @@
-// RUN: %swiftc_driver -emit-ir %s -o - | %FileCheck %s -check-prefix ELF
+// RUN: %swiftc_driver -emit-ir %s -o - -Xfrontend -disable-implicit-concurrency-module-import | %FileCheck %s -check-prefix ELF
 
 // Check that the swift auto link section is available in the object file.
-// RUN: %swiftc_driver -c %s -o %t
+// RUN: %swiftc_driver -c %s -o %t -Xfrontend -disable-implicit-concurrency-module-import
 // RUN: llvm-readelf %t -S | %FileCheck %s -check-prefix SECTION
 
 // Checks that the swift auto link section is removed from the final binary.
-// RUN: %swiftc_driver  -emit-executable %s -o %t
+// RUN: %swiftc_driver  -emit-executable %s -o %t -Xfrontend -disable-implicit-concurrency-module-import
 // RUN: llvm-readelf %t -S | %FileCheck %s -check-prefix NOSECTION
 
 // REQUIRES: OS=linux-gnu

test/Index/Store/cross-import-overlay.swift

@@ -30,6 +30,7 @@ from__ABAdditionsCAdditions()
 // MAIN-NEXT: is-debug: 1
 // MAIN-NEXT: DEPEND START
 // MAIN-NEXT: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule
+// MAIN-NEXT: Unit | system | _Concurrency | {{.*}}{{/|\\}}_Concurrency.swiftmodule
 // MAIN-NEXT: Unit | system | B | {{.*}}{{/|\\}}B.swiftmodule{{/|\\}}{{.*}}
 // MAIN-NEXT: Unit | system | C | {{.*}}{{/|\\}}C.swiftmodule{{/|\\}}{{.*}}
 // MAIN-NEXT: Unit | system | A | {{.*}}{{/|\\}}__ABAdditionsCAdditions.swiftmodule{{/|\\}}{{.*}}

test/Index/Store/unit-from-compile.swift

@@ -16,6 +16,7 @@
 
 // CHECK: DEPEND START
 // CHECK: Unit | system | {{.*}}{{/|\\}}Swift.swiftmodule
-// CHECK: DEPEND END (1)
+// CHECK: Unit | system | _Concurrency
+// CHECK: DEPEND END (2)
 
 // OPT: is-debug: 1