Implicitly import _Concurrency under -enable-experimental-concurrency

rjmccall · rjmccall · commit a8464dcaf114 · 2020-10-22T00:53:15.000-04:00
diff --git a/include/swift/Frontend/Frontend.h b/include/swift/Frontend/Frontend.h
@@ -337,6 +337,10 @@ class CompilerInvocation {
   /// Whether the Swift -Onone support library should be implicitly imported.
   bool shouldImportSwiftONoneSupport() const;
 
+  /// Whether the Swift Concurrency support library should be implicitly
+  /// imported.
+  bool shouldImportSwiftConcurrency() const;
+
   /// Performs input setup common to these tools:
   /// sil-opt, sil-func-extractor, sil-llvm-gen, and sil-nm.
   /// Return value includes the buffer so caller can keep it alive.
diff --git a/include/swift/Strings.h b/include/swift/Strings.h
@@ -22,6 +22,8 @@ namespace swift {
 constexpr static const StringLiteral STDLIB_NAME = "Swift";
 /// The name of the Onone support library, which is a reserved module name.
 constexpr static const StringLiteral SWIFT_ONONE_SUPPORT = "SwiftOnoneSupport";
+/// The name of the Concurrency module, which supports that extension.
+constexpr static const StringLiteral SWIFT_CONCURRENCY_NAME = "_Concurrency";
 /// The name of the SwiftShims module, which contains private stdlib decls.
 constexpr static const StringLiteral SWIFT_SHIMS_NAME = "SwiftShims";
 /// The name of the Builtin module, which contains Builtin functions.
diff --git a/lib/Frontend/Frontend.cpp b/lib/Frontend/Frontend.cpp
@@ -707,6 +707,10 @@ CompilerInstance::openModuleDoc(const InputFile &input) {
   return None;
 }
 
+bool CompilerInvocation::shouldImportSwiftConcurrency() const {
+  return getLangOptions().EnableExperimentalConcurrency;
+}
+
 /// Implicitly import the SwiftOnoneSupport module in non-optimized
 /// builds. This allows for use of popular specialized functions
 /// from the standard library, which makes the non-optimized builds
@@ -758,6 +762,10 @@ ImplicitImportInfo CompilerInstance::getImplicitImportInfo() const {
     pushImport(SWIFT_ONONE_SUPPORT);
   }
 
+  if (Invocation.shouldImportSwiftConcurrency()) {
+    pushImport(SWIFT_CONCURRENCY_NAME);
+  }
+
   imports.ShouldImportUnderlyingModule = frontendOpts.ImportUnderlyingModule;
   imports.BridgingHeaderPath = frontendOpts.ImplicitObjCHeaderPath;
   return imports;
diff --git a/test/Casting/Casts.swift b/test/Casting/Casts.swift
@@ -24,6 +24,7 @@
 // RUN: %target-run %t/a.swift5.O.out
 //
 // REQUIRES: executable_test
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 import StdlibUnittest
diff --git a/test/ClangImporter/objc_async.swift b/test/ClangImporter/objc_async.swift
@@ -1,6 +1,7 @@
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -I %S/Inputs/custom-modules -enable-experimental-concurrency %s -verify
 
 // REQUIRES: objc_interop
+// REQUIRES: concurrency
 import Foundation
 import ObjCConcurrency
 
diff --git a/test/Concurrency/actor_isolation.swift b/test/Concurrency/actor_isolation.swift
@@ -1,8 +1,6 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-concurrency
 // REQUIRES: concurrency
 
-import _Concurrency
-
 let immutableGlobal: String = "hello"
 var mutableGlobal: String = "can't touch this" // expected-note 2{{var declared here}}
 
diff --git a/test/Concurrency/global_actor_inference.swift b/test/Concurrency/global_actor_inference.swift
@@ -1,8 +1,6 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-concurrency
 // REQUIRES: concurrency
 
-import _Concurrency
-
 actor class SomeActor { }
 
 @globalActor
diff --git a/test/Constraints/async.swift b/test/Constraints/async.swift
@@ -1,5 +1,7 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-concurrency
 
+// REQUIRES: concurrency
+
 func doAsynchronously() async { }
 func doSynchronously() { }
 
diff --git a/test/IDE/print_clang_objc_async.swift b/test/IDE/print_clang_objc_async.swift
@@ -4,6 +4,7 @@
 // RUN: %FileCheck -input-file %t/ObjCConcurrency.printed.txt %s
 
 // REQUIRES: objc_interop
+// REQUIRES: concurrency
 
 // CHECK-LABEL: class SlowServer : NSObject {
 // CHECK-DAG:     func doSomethingSlow(_ operation: String, completionHandler handler: @escaping (Int) -> Void)
diff --git a/test/IRGen/async.swift b/test/IRGen/async.swift
@@ -1,5 +1,7 @@
 // RUN: %target-swift-frontend -primary-file %s -emit-ir -enable-experimental-concurrency | %FileCheck %s
 
+// REQUIRES: concurrency
+
 // CHECK: "$s5async1fyyYF"
 public func f() async { }
 
diff --git a/test/IRGen/async/run-call-classinstance-int64-to-void.sil b/test/IRGen/async/run-call-classinstance-int64-to-void.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-classinstance-void-to-void.sil b/test/IRGen/async/run-call-classinstance-void-to-void.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-existential-to-void.sil b/test/IRGen/async/run-call-existential-to-void.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-generic-to-generic.sil b/test/IRGen/async/run-call-generic-to-generic.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-generic-to-void.sil b/test/IRGen/async/run-call-generic-to-void.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-genericEquatable-x2-to-bool.sil b/test/IRGen/async/run-call-genericEquatable-x2-to-bool.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-int64-and-int64-to-void.sil b/test/IRGen/async/run-call-int64-and-int64-to-void.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-int64-to-void.sil b/test/IRGen/async/run-call-int64-to-void.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-protocolextension_instance-void-to-int64.sil b/test/IRGen/async/run-call-protocolextension_instance-void-to-int64.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 import Builtin
diff --git a/test/IRGen/async/run-call-protocolwitness_instance-void-to-int64.sil b/test/IRGen/async/run-call-protocolwitness_instance-void-to-int64.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 import Builtin
diff --git a/test/IRGen/async/run-call-structinstance-int64-to-void.sil b/test/IRGen/async/run-call-structinstance-int64-to-void.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 import Builtin
diff --git a/test/IRGen/async/run-call-void-throws-to-int-throwing.sil b/test/IRGen/async/run-call-void-throws-to-int-throwing.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-void-throws-to-int-throwing_call-async-nothrow_call-sync-throw.sil b/test/IRGen/async/run-call-void-throws-to-int-throwing_call-async-nothrow_call-sync-throw.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 import Builtin
diff --git a/test/IRGen/async/run-call-void-throws-to-int-throwing_call-async-throw.sil b/test/IRGen/async/run-call-void-throws-to-int-throwing_call-async-throw.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-void-throws-to-int-throwing_call-sync-nothrow_call-async-throw.sil b/test/IRGen/async/run-call-void-throws-to-int-throwing_call-sync-nothrow_call-async-throw.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-void-throws-to-int-throwing_call-sync-throw.sil b/test/IRGen/async/run-call-void-throws-to-int-throwing_call-sync-throw.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-void-to-existential.sil b/test/IRGen/async/run-call-void-to-existential.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-void-to-int64-and-int64.sil b/test/IRGen/async/run-call-void-to-int64-and-int64.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-void-to-int64.sil b/test/IRGen/async/run-call-void-to-int64.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 
diff --git a/test/IRGen/async/run-call-void-to-struct_large.sil b/test/IRGen/async/run-call-void-to-struct_large.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 import Builtin
diff --git a/test/IRGen/async/run-call_generic-protocolwitness_instance-generic-to-int64-and-generic.sil b/test/IRGen/async/run-call_generic-protocolwitness_instance-generic-to-int64-and-generic.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 import Builtin
diff --git a/test/IRGen/async/run-call_generic-protocolwitness_instance-void-to-int64.sil b/test/IRGen/async/run-call_generic-protocolwitness_instance-void-to-int64.sil
@@ -8,6 +8,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: swift_test_mode_optimize_none
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 import Builtin
diff --git a/test/IRGen/ptrauth-actor.swift b/test/IRGen/ptrauth-actor.swift
@@ -5,7 +5,6 @@
 // REQUIRES: CPU=arm64e
 // REQUIRES: OS=macosx
 
-import _Concurrency
 import Swift
 
 public actor class A1 {
diff --git a/test/ModuleInterface/actor_isolation.swift b/test/ModuleInterface/actor_isolation.swift
@@ -5,7 +5,6 @@
 // RUN: %FileCheck %s --check-prefix FROMMODULE --check-prefix CHECK < %t/TestFromModule.swiftinterface
 
 // REQUIRES: concurrency
-import _Concurrency
 
 // CHECK: actor public class SomeActor
 public actor class SomeActor {
diff --git a/test/ModuleInterface/concurrency.swift b/test/ModuleInterface/concurrency.swift
@@ -1,6 +1,8 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend -typecheck -enable-library-evolution -enable-experimental-concurrency -emit-module-interface-path %t/Library.swiftinterface -DLIBRARY -module-name Library %s
 
+// REQUIRES: concurrency
+
 #if LIBRARY
 public func fn() async {
   fatalError()
diff --git a/test/Parse/async-syntax.swift b/test/Parse/async-syntax.swift
@@ -1,5 +1,7 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-concurrency -verify-syntax-tree
 
+// REQUIRES: concurrency
+
 func asyncGlobal1() async { }
 func asyncGlobal2() async throws { }
 
diff --git a/test/Parse/async.swift b/test/Parse/async.swift
@@ -1,5 +1,7 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-concurrency
 
+// REQUIRES: concurrency
+
 // Parsing function declarations with 'async'
 func asyncGlobal1() async { }
 func asyncGlobal2() async throws { }
diff --git a/test/PrintAsObjC/async.swift b/test/PrintAsObjC/async.swift
@@ -9,6 +9,7 @@
 // RUN:  %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -emit-module -o %t  %S/../Inputs/clang-importer-sdk/swift-modules/AppKit.swift
 // FIXME: END -enable-source-import hackaround
 
+// REQUIRES: concurrency
 
 // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -parse-as-library %s -typecheck -I %S/Inputs/custom-modules -emit-objc-header-path %t/async.h -import-objc-header %S/../Inputs/empty.h  -enable-experimental-concurrency -typecheck
 // RUN: %FileCheck %s < %t/async.h
diff --git a/test/Runtime/demangleToMetadata.swift b/test/Runtime/demangleToMetadata.swift
@@ -3,6 +3,7 @@
 // RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out
 // REQUIRES: executable_test
+// REQUIRES: concurrency
 // UNSUPPORTED: use_os_stdlib
 
 import Swift
diff --git a/test/SILGen/synthesized_conformance_actor.swift b/test/SILGen/synthesized_conformance_actor.swift
@@ -1,8 +1,6 @@
 // RUN: %target-swift-frontend -emit-silgen %s -swift-version 5 -enable-experimental-concurrency | %FileCheck -check-prefix CHECK %s
 // REQUIRES: concurrency
 
-import _Concurrency
-
 public protocol DefaultInit {
   init()
 }
diff --git a/test/Serialization/async.swift b/test/Serialization/async.swift
@@ -4,6 +4,8 @@
 // RUN: %target-swift-frontend -merge-modules -emit-module -parse-as-library -enable-testing %t-scratch/def_async~partial.swiftmodule -module-name def_async -o %t/def_async.swiftmodule -enable-experimental-concurrency
 // RUN: %target-swift-frontend -typecheck -I%t -verify %s -verify-ignore-unknown -enable-experimental-concurrency
 
+// REQUIRES: concurrency
+
 import def_async
 
 func testDoSomethingBig() {
diff --git a/test/Serialization/attr-actorindependent.swift b/test/Serialization/attr-actorindependent.swift
@@ -5,6 +5,8 @@
 // RUN: %target-swift-frontend -enable-experimental-concurrency -emit-module-path %t/b.swiftmodule -module-name a  %t/a.swiftmodule
 // RUN: cmp -s %t/a.swiftmodule %t/b.swiftmodule
 
+// REQUIRES: concurrency
+
 ///////////
 // This test checks for correct serialization & deserialization of
 // @actorIndependent and @actorIndependent(unsafe)
@@ -15,6 +17,8 @@
 // MODULE-CHECK-NEXT:   @actorIndependent(unsafe) var storage: Int
 // MODULE-CHECK-NEXT:   @actorIndependent var count: Int
 // MODULE-CHECK-NEXT:   var actorCount: Int
+// MODULE-CHECK-NEXT:   @actorIndependent(unsafe) func enqueue(partialTask: PartialAsyncTask)
+// MODULE-CHECK-NEXT:   var $__actor_storage: _DefaultActorQueue
 // MODULE-CHECK-NEXT:   init()
 // MODULE-CHECK-NEXT: }
 
diff --git a/test/TypeDecoder/concurrency.swift b/test/TypeDecoder/concurrency.swift
@@ -5,6 +5,8 @@
 // RUN: sed -ne '/\/\/ *DEMANGLE-TYPE: /s/\/\/ *DEMANGLE-TYPE: *//p' < %s > %t/input
 // RUN: %lldb-moduleimport-test-with-sdk %t/concurrency -type-from-mangled=%t/input | %FileCheck %s --check-prefix=CHECK-TYPE
 
+// REQUIRES: concurrency
+
 func blackHole(_: Any...) {}
 
 public var lookAtMeeee: [(Int) async -> Void] = []
diff --git a/test/attr/actorindependent.swift b/test/attr/actorindependent.swift
@@ -1,5 +1,7 @@
 // RUN: %target-swift-frontend -typecheck -verify %s -enable-experimental-concurrency
 
+// REQUIRES: concurrency
+
 // expected-error@+1{{'@actorIndependent' can only be applied to actor members and global/static variables}}
 @actorIndependent func globalFunction() { }
 
diff --git a/test/attr/actorindependent_unsafe.swift b/test/attr/actorindependent_unsafe.swift
@@ -1,5 +1,7 @@
 // RUN: %target-swift-frontend -typecheck -verify %s -enable-experimental-concurrency
 
+// REQUIRES: concurrency
+
 //////////////////////////
 /// Cases that only work because of @actorIndependent(unsafe)
 //////////////////////////
diff --git a/test/attr/asynchandler.swift b/test/attr/asynchandler.swift
diff --git a/test/attr/attr_cdecl_async.swift b/test/attr/attr_cdecl_async.swift
diff --git a/test/attr/global_actor.swift b/test/attr/global_actor.swift
diff --git a/test/decl/async/objc.swift b/test/decl/async/objc.swift
diff --git a/test/decl/class/actor/basic.swift b/test/decl/class/actor/basic.swift
diff --git a/test/decl/class/actor/conformance.swift b/test/decl/class/actor/conformance.swift
diff --git a/test/decl/class/actor/global_actor_conformance.swift b/test/decl/class/actor/global_actor_conformance.swift
diff --git a/test/decl/func/async.swift b/test/decl/func/async.swift
diff --git a/test/decl/protocol/conforms/objc_async.swift b/test/decl/protocol/conforms/objc_async.swift
diff --git a/test/decl/protocol/special/Actor.swift b/test/decl/protocol/special/Actor.swift
diff --git a/test/expr/unary/async_await.swift b/test/expr/unary/async_await.swift
diff --git a/validation-test/compiler_crashers_2_fixed/rdar70144083.swift b/validation-test/compiler_crashers_2_fixed/rdar70144083.swift

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`// RUN: %target-swift-frontend -emit-silgen %s -swift-version 5 -enable-experimental-concurrency \| %FileCheck -check-prefix CHECK %s`
`2`	`2`	`// REQUIRES: concurrency`
`3`	`3`
`4`		`-import _Concurrency`
`5`		`-`
`6`	`4`	`public protocol DefaultInit {`
`7`	`5`	`init()`
`8`	`6`	`}`