Merge pull request #2574 from aciidb0mb3r/break-will-break-your-bones-5.2

[PackageLoading] Handle duplicated declared sources

Author: aciidgh

Sources/PackageLoading/TargetSourcesBuilder.swift

@@ -158,6 +158,10 @@ public struct TargetSourcesBuilder {
                     } else {
                         matchedRule = .compile
                     }
+                    // The source file might have been declared twice so
+                    // exit on first match.
+                    // FIXME: We should emitting warnings for duplicate// declarations.
+                    break
                 }
             }
         }

Tests/PackageLoadingTests/PackageBuilderTests.swift

@@ -290,6 +290,32 @@ class PackageBuilderTests: XCTestCase {
         }
     }
 
+    func testOverlappingDeclaredSources() throws {
+        let fs = InMemoryFileSystem(emptyFiles:
+            "/Sources/clib/subfolder/foo.h",
+            "/Sources/clib/subfolder/foo.c",
+            "/Sources/clib/bar.h",
+            "/Sources/clib/bar.c",
+            "/done"
+        )
+
+        let manifest = Manifest.createV4Manifest(
+            name: "MyPackage",
+            targets: [
+                TargetDescription(
+                    name: "clib",
+                    path: "Sources",
+                    sources: ["clib", "clib/subfolder"]
+                ),
+            ]
+        )
+        PackageBuilderTester(manifest, in: fs) { result in
+            result.checkModule("clib") { module in
+                module.checkSources(sources: ["clib/bar.c", "clib/subfolder/foo.c"])
+            }
+        }
+    }
+
     func testDeclaredExecutableProducts() {
         // Check that declaring executable product doesn't collide with the
         // inferred products.

Tests/PackageLoadingTests/XCTestManifests.swift

@@ -31,6 +31,7 @@ extension PackageBuilderTests {
         ("testCustomTargetPaths", testCustomTargetPaths),
         ("testCustomTargetPathsOverlap", testCustomTargetPathsOverlap),
         ("testDeclaredExecutableProducts", testDeclaredExecutableProducts),
+        ("testDeclaredSourcesWithDot", testDeclaredSourcesWithDot),
         ("testDotFilesAreIgnored", testDotFilesAreIgnored),
         ("testDuplicateProducts", testDuplicateProducts),
         ("testDuplicateTargetDependencies", testDuplicateTargetDependencies),
@@ -46,6 +47,7 @@ extension PackageBuilderTests {
         ("testMixedSources", testMixedSources),
         ("testModuleMapLayout", testModuleMapLayout),
         ("testMultipleTestProducts", testMultipleTestProducts),
+        ("testOverlappingDeclaredSources", testOverlappingDeclaredSources),
         ("testPlatforms", testPlatforms),
         ("testPredefinedTargetSearchError", testPredefinedTargetSearchError),
         ("testPublicHeadersPath", testPublicHeadersPath),