[Dependency Scanning] Add an implicit dependency on the '_SwiftConcurrencyShims' library

Whenever concurrency mode is enabled in compilation

Author: artemcm

include/swift/Frontend/Frontend.h

@@ -559,6 +559,10 @@ class CompilerInstance {
   /// i.e. if it can be found.
   bool canImportSwiftConcurrency() const;
 
+  /// Whether the Swift Concurrency Shims support Clang library can be imported
+  /// i.e. if it can be found.
+  bool canImportSwiftConcurrencyShims() const;
+
   /// Verify that if an implicit import of the `StringProcessing` module if
   /// expected, it can actually be imported. Emit a warning, otherwise.
   void verifyImplicitStringProcessingImport();

include/swift/Strings.h

@@ -24,6 +24,8 @@ constexpr static const StringLiteral STDLIB_NAME = "Swift";
 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 Concurrency Shims Clang module
+constexpr static const StringLiteral SWIFT_CONCURRENCY_SHIMS_NAME = "_SwiftConcurrencyShims";
 /// The name of the Distributed module, which supports that extension.
 constexpr static const StringLiteral SWIFT_DISTRIBUTED_NAME = "Distributed";
 /// The name of the StringProcessing module, which supports that extension.

lib/Frontend/Frontend.cpp

@@ -870,6 +870,13 @@ bool CompilerInstance::canImportSwiftConcurrency() const {
   return getASTContext().canImportModule(modulePath);
 }
 
+bool CompilerInstance::canImportSwiftConcurrencyShims() const {
+  ImportPath::Module::Builder builder(
+      getASTContext().getIdentifier(SWIFT_CONCURRENCY_SHIMS_NAME));
+  auto modulePath = builder.get();
+  return getASTContext().canImportModule(modulePath);
+}
+
 void CompilerInstance::verifyImplicitStringProcessingImport() {
   if (Invocation.shouldImportSwiftStringProcessing() &&
       !canImportSwiftStringProcessing()) {
@@ -930,6 +937,8 @@ ImplicitImportInfo CompilerInstance::getImplicitImportInfo() const {
     case ImplicitStdlibKind::Stdlib:
       if (canImportSwiftConcurrency())
         pushImport(SWIFT_CONCURRENCY_NAME);
+      if (canImportSwiftConcurrencyShims())
+        pushImport(SWIFT_CONCURRENCY_SHIMS_NAME);
       break;
     }
   }

test/ScanDependencies/can_import_placeholder.swift

@@ -38,4 +38,5 @@ import SomeExternalModule
 // CHECK-DAG: "swift": "SwiftOnoneSupport"
 // CHECK-DAG: "swift": "_Concurrency"
 // CHECK-DAG: "swift": "_StringProcessing"
+// CHECK-DAG: "clang": "_SwiftConcurrencyShims"
 // CHECK: ],

test/ScanDependencies/module_deps_cache_reuse.swift

@@ -41,6 +41,7 @@ import SubE
 // CHECK-DAG:     "swift": "_Concurrency"
 // CHECK-DAG:     "swift": "_StringProcessing"
 // CHECK-DAG:     "swift": "_cross_import_E"
+// CHECK-DAG:     "clang": "_SwiftConcurrencyShims"
 // CHECK: ],
 
 // CHECK:      "extraPcmArgs": [

test/ScanDependencies/module_deps_cross_import_overlay.swift

@@ -23,4 +23,5 @@ import SubEWrapper
 // CHECK-DAG:   "swift": "_Concurrency"
 // CHECK-DAG:   "swift": "_StringProcessing"
 // CHECK-DAG:   "swift": "_cross_import_E"
+// CHECK-DAG:   "clang": "_SwiftConcurrencyShims"
 // CHECK: ],

test/ScanDependencies/module_deps_external.swift

@@ -50,6 +50,7 @@ import SomeExternalModule
 // CHECK-DAG: "swift": "SwiftOnoneSupport"
 // CHECK-DAG: "swift": "_Concurrency"
 // CHECK-DAG: "swift": "_StringProcessing"
+// CHECK-DAG: "clang": "_SwiftConcurrencyShims"
 // CHECK: ],
 
 // CHECK:      "extraPcmArgs": [

test/ScanDependencies/prescan_deps.swift

@@ -20,6 +20,7 @@ import SubE
 // CHECK-NEXT:  "SubE",
 // CHECK-NEXT:  "Swift",
 // CHECK-NEXT:  "SwiftOnoneSupport",
-// CHECK-NEXT:  "_Concurrency"
+// CHECK-NEXT:  "_Concurrency",
+// CHECK-NEXT:  "_SwiftConcurrencyShims",
 // CHECK-NEXT:  "_StringProcessing"
 // CHECK-NEXT: ]