Merge pull request #78192 from hamishknight/couple-of-xcodegen-fixes

[xcodegen] A couple of fixes for `--stdlib-swift`

Author: hamishknight

utils/swift-xcodegen/Sources/SwiftXcodeGen/BuildArgs/SwiftTargets.swift

@@ -212,7 +212,11 @@ struct SwiftTargets {
     // Add the dependencies. We track dependencies for any input files, along
     // with any recorded swiftmodule dependencies.
     dependenciesByTargetName.withValue(for: name, default: []) { deps in
-      deps.formUnion(rule.inputs)
+      deps.formUnion(
+        rule.inputs.filter {
+          $0.hasExtension(.swiftmodule) || $0.hasExtension(.o)
+        }
+      )
       deps.formUnion(
         rule.dependencies.filter { $0.hasExtension(.swiftmodule) }
       )

utils/swift-xcodegen/Sources/SwiftXcodeGen/Generator/ProjectGenerator.swift

@@ -531,11 +531,20 @@ fileprivate final class ProjectGenerator {
     guard checkNotExcluded(buildRule.parentPath, for: "Swift target") else {
       return nil
     }
-    // Create the target. Swift targets can always use buildable folders
-    // since they have a consistent set of arguments.
+    // Swift targets can almost always use buildable folders since they have
+    // a consistent set of arguments, but we need to ensure we don't have any
+    // child source files that aren't part of the target.
+    let canUseBuildableFolder = try {
+      guard let parent = buildRule.parentPath else { return false }
+      let repoSources = Set(buildRule.sources.repoSources)
+      return try getAllRepoSubpaths(of: parent)
+        .allSatisfy { !$0.isSourceLike || repoSources.contains($0) }
+    }()
+    // Create the target.
     let target = generateBaseTarget(
-      targetInfo.name, at: buildRule.parentPath, canUseBuildableFolder: true,
-      productType: .staticArchive, includeInAllTarget: includeInAllTarget
+      targetInfo.name, at: buildRule.parentPath,
+      canUseBuildableFolder: canUseBuildableFolder, productType: .staticArchive,
+      includeInAllTarget: includeInAllTarget
     )
     guard let target else { return nil }
 
@@ -558,6 +567,13 @@ fileprivate final class ProjectGenerator {
       buildSettings.common.DEFINES_MODULE = "YES"
     }
 
+    // Disable the Obj-C bridging header; we don't currently use this, and
+    // even if we did, we'd probably want to use the one in the Ninja build
+    // folder.
+    // This also works around a compiler crash
+    // (https://github.com/swiftlang/swift/issues/78190).
+    buildSettings.common.SWIFT_OBJC_INTERFACE_HEADER_NAME = ""
+
     if let last = buildArgs.takeFlagGroup(.O, .Onone) {
       buildSettings.common.SWIFT_OPTIMIZATION_LEVEL = last.printed
     }

utils/swift-xcodegen/Sources/SwiftXcodeGen/Path/FileExtension.swift

@@ -16,7 +16,9 @@ public enum FileExtension: String {
   case def
   case gyb
   case h
+  case m
   case md
+  case mm
   case modulemap
   case o
   case rst

utils/swift-xcodegen/Sources/SwiftXcodeGen/Path/PathProtocol.swift

@@ -124,7 +124,11 @@ extension PathProtocol {
   }
 
   var isCSourceLike: Bool {
-    hasExtension(.c, .cpp)
+    hasExtension(.c, .cpp, .m, .mm)
+  }
+
+  var isSourceLike: Bool {
+    isCSourceLike || hasExtension(.swift)
   }
 
   var isDocLike: Bool {

utils/swift-xcodegen/Sources/Xcodeproj/XcodeProjectModel.swift

@@ -441,6 +441,7 @@ public struct Xcode {
       public var SWIFT_FORCE_DYNAMIC_LINK_STDLIB: String?
       public var SWIFT_INCLUDE_PATHS: [String]?
       public var SWIFT_MODULE_ALIASES: [String: String]?
+      public var SWIFT_OBJC_INTERFACE_HEADER_NAME: String?
       public var SWIFT_OPTIMIZATION_LEVEL: String?
       public var SWIFT_VERSION: String?
       public var TARGET_NAME: String?