Merge pull request #68842 from artemcm/510OptionalPrivateClangSubmodule

[5.10 🍒][Dependency Scanning] Only optionally try to resolve imports of 'Foo.Private' submodules to `Foo_Private` top-level modules.

Author: artemcm

include/swift/AST/ModuleDependencies.h

@@ -699,7 +699,7 @@ class ModuleDependencyInfo {
       // Special case: a submodule named "Foo.Private" can be moved to a top-level
       // module named "Foo_Private". ClangImporter has special support for this.
       if (submoduleComponent.Item.str() == "Private")
-        ImportedModuleName = ImportedModuleName + "_Private";
+        addOptionalModuleImport(ImportedModuleName + "_Private", alreadyAddedModules);
     }
 
     addModuleImport(ImportedModuleName, alreadyAddedModules);

test/ScanDependencies/Inputs/CHeaders/Y.h

@@ -0,0 +1 @@
+void funcY(void);

test/ScanDependencies/Inputs/CHeaders/Y_Private.h

@@ -0,0 +1 @@
+void funcYPrivate(void);

test/ScanDependencies/Inputs/CHeaders/module.modulemap

@@ -46,3 +46,10 @@ module X_Private {
   header "X_Private.h"
   export *
 }
+module Y {
+  header "Y.h"
+  export *
+  explicit module Private {
+    header "Y_Private.h"
+  }
+}

test/ScanDependencies/module_deps_clang_private_submodule.swift

@@ -1,7 +1,9 @@
 // RUN: %empty-directory(%t.module-cache)
-// RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t.module-cache %s -o %t.deps.json -I %S/Inputs/CHeaders
+// RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t.module-cache %s -o %t.deps.json -I %S/Inputs/CHeaders -verify
 
 // RUN: %validate-json %t.deps.json | %FileCheck %s
 // CHECK: "clang": "X_Private"
+// CHECK: "clang": "Y"
+// CHECK-NOT: "clang": "Y_Private"
 import X.Private
-
+import Y.Private