Merge pull request #69469 from artemcm/FixCrossImportOverlayTypo

[Dependency Scan] On cross-import overlay discovery, do not exit on main module...

Author: artemcm

lib/DependencyScan/ModuleDependencyScanner.cpp

@@ -800,7 +800,7 @@ void ModuleDependencyScanner::discoverCrossImportOverlayDependencies(
       auto moduleName = dependencyId.ModuleName;
       // Do not look for overlays of main module under scan
       if (moduleName == mainModuleName)
-        return;
+        continue;
       // check if any explicitly imported modules can serve as a
       // secondary module, and add the overlay names to the
       // dependencies list.

test/ScanDependencies/Inputs/CHeaders/ExtraCModules/CrossImportTestModule.h

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

test/ScanDependencies/Inputs/CHeaders/ExtraCModules/module.modulemap

@@ -1,4 +1,8 @@
 module SubE {
   header "SubE.h"
   export *
+}
+module CrossImportTestModule {
+  header "CrossImportTestModule.h"
+  export *
 }

test/ScanDependencies/module_deps_cross_import_overlay.swift

@@ -1,16 +1,17 @@
 // RUN: %empty-directory(%t)
 // RUN: mkdir -p %t/clang-module-cache
-// RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t/clang-module-cache %s -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -emit-dependencies -emit-dependencies-path %t/deps.d -import-objc-header %S/Inputs/CHeaders/Bridging.h -swift-version 4
+// RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t/clang-module-cache %s -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -I %S/Inputs/CHeaders/ExtraCModules -emit-dependencies -emit-dependencies-path %t/deps.d -import-objc-header %S/Inputs/CHeaders/Bridging.h -swift-version 4 -module-name CrossImportTestModule
 // Check the contents of the JSON output
 // RUN: %validate-json %t/deps.json | %FileCheck %s
 
 // Ensure that round-trip serialization does not affect result
-// RUN: %target-swift-frontend -scan-dependencies -test-dependency-scan-cache-serialization -module-cache-path %t/clang-module-cache %s -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -emit-dependencies -emit-dependencies-path %t/deps.d -import-objc-header %S/Inputs/CHeaders/Bridging.h -swift-version 4
+// RUN: %target-swift-frontend -scan-dependencies -test-dependency-scan-cache-serialization -module-cache-path %t/clang-module-cache %s -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -I %S/Inputs/CHeaders/ExtraCModules -emit-dependencies -emit-dependencies-path %t/deps.d -import-objc-header %S/Inputs/CHeaders/Bridging.h -swift-version 4 -module-name CrossImportTestModule
 // RUN: %validate-json %t/deps.json | %FileCheck %s
 
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+import CrossImportTestModule
 import EWrapper
 import SubEWrapper
 
@@ -24,6 +25,7 @@ import SubEWrapper
 // CHECK-DAG:   "swift": "_StringProcessing"
 // CHECK-DAG:   "swift": "_cross_import_E"
 // CHECK-DAG:   "clang": "_SwiftConcurrencyShims"
+// CHECK-DAG:   "clang": "CrossImportTestModule"
 // Ensure a transitive dependency via "_cross_import_E" is not a direct dep of main module
 // CHECK-NOT:   "clang": "X"
 // CHECK: ],