Merge branch 'main' into automerge/merge-main-2025-06-23_09-03

Author: owenv

.github/workflows/automerge.yml

@@ -10,7 +10,8 @@ jobs:
     name: Create PR to merge main into release branch
     uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main
     with:
-      base_branch: release/6.2
+      head_branch: release/6.2
+      base_branch: main
     permissions:
       contents: write
       pull-requests: write

.licenseignore

@@ -5,5 +5,6 @@
 **/Package.swift
 .dir-locals.el
 .editorconfig
+.swift-version
 CODEOWNERS
 Package.swift

.swift-version

@@ -0,0 +1 @@
+6.1.0

Package.swift

@@ -110,7 +110,7 @@ let package = Package(
                 "SWBBuildSystem",
                 "SWBServiceCore",
                 "SWBTaskExecution",
-                .product(name: "SystemPackage", package: "swift-system", condition: .when(platforms: [.linux, .android, .windows])),
+                .product(name: "SystemPackage", package: "swift-system", condition: .when(platforms: [.linux, .openbsd, .android, .windows, .custom("freebsd")])),
             ],
             exclude: ["CMakeLists.txt"],
             swiftSettings: swiftSettings(languageMode: .v5)),
@@ -201,7 +201,7 @@ let package = Package(
                 "SWBCSupport",
                 "SWBLibc",
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                .product(name: "SystemPackage", package: "swift-system", condition: .when(platforms: [.linux, .android, .windows])),
+                .product(name: "SystemPackage", package: "swift-system", condition: .when(platforms: [.linux, .openbsd, .android, .windows, .custom("freebsd")])),
             ],
             exclude: ["CMakeLists.txt"],
             swiftSettings: swiftSettings(languageMode: .v5)),
@@ -369,7 +369,7 @@ let package = Package(
         // Perf tests
         .testTarget(
             name: "SWBBuildSystemPerfTests",
-            dependencies: ["SWBBuildSystem", "SWBTestSupport"],
+            dependencies: ["SWBBuildSystem", "SWBTestSupport", "SwiftBuildTestSupport"],
             swiftSettings: swiftSettings(languageMode: .v6)),
         .testTarget(
             name: "SWBCASPerfTests",
@@ -455,11 +455,11 @@ if useLocalDependencies {
     }
 } else {
     package.dependencies += [
-        .package(url: "https://github.com/swiftlang/swift-driver.git", branch: "release/6.2"),
+        .package(url: "https://github.com/swiftlang/swift-driver.git", branch: "main"),
         .package(url: "https://github.com/apple/swift-system.git", .upToNextMajor(from: "1.5.0")),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.0.3"),
     ]
     if !useLLBuildFramework {
-        package.dependencies += [.package(url: "https://github.com/swiftlang/swift-llbuild.git", branch: "release/6.2"),]
+        package.dependencies += [.package(url: "https://github.com/swiftlang/swift-llbuild.git", branch: "main"),]
     }
 }

README.md

@@ -12,11 +12,11 @@ When building SwiftPM from sources which include Swift Build integration, passin
 
 ### With Xcode
 
-Changes to swift-build can also be tested in Xcode using the `launch-xcode` command plugin provided by the package. Run `swift package --disable-sandbox launch-xcode` from your checkout of swift-build to launch a copy of the currently `xcode-select`ed Xcode.app configured to use your modified copy of the build system service. This workflow is currently supported when using Xcode 16.2.
+Changes to swift-build can also be tested in Xcode using the `launch-xcode` command plugin provided by the package. Run `swift package --disable-sandbox launch-xcode` from your checkout of swift-build to launch a copy of the currently `xcode-select`ed Xcode.app configured to use your modified copy of the build system service. This workflow is generally only supported when using the latest available Xcode version.
 
 ### With xcodebuild
 
-Changes to swift-build can also be tested in xcodebuild using the `run-xcodebuild` command plugin provided by the package. Run `swift package --disable-sandbox run-xcodebuild` from your checkout of swift-build to run xcodebuild from the currently `xcode-select`ed Xcode.app configured to use your modified copy of the build system service. Arguments followed by `--` will be forwarded to xcodebuild unmodified. This workflow is currently supported when using Xcode 16.2.
+Changes to swift-build can also be tested in xcodebuild using the `run-xcodebuild` command plugin provided by the package. Run `swift package --disable-sandbox run-xcodebuild` from your checkout of swift-build to run xcodebuild from the currently `xcode-select`ed Xcode.app configured to use your modified copy of the build system service. Arguments followed by `--` will be forwarded to xcodebuild unmodified. This workflow is generally only supported when using the latest available Xcode version.
 
 ### Debugging
 

Sources/SWBApplePlatform/Specs/DarwinProductTypes.xcspec

@@ -461,4 +461,17 @@
         );
         Platforms = (driverkit);
     },
+    {
+        _Domain = darwin;
+        Type = ProductType;
+        Identifier = com.apple.product-type.tool.swiftpm-test-runner;
+        Name = "SwiftPM Unit Test Runner";
+        Description = "SwiftPM Unit Test Runner";
+        DefaultBuildProperties = {
+            __SKIP_BUILD = YES;
+        };
+        PackageTypes = (
+            com.apple.package-type.mach-o-executable
+        );
+    },
 )

Sources/SWBBuildSystem/BuildOperation.swift

@@ -2304,9 +2304,9 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
     private func inputNounPhraseForBuildKey(_ inputKey: BuildKey) -> String {
         switch inputKey {
         case is BuildKey.Command, is BuildKey.CustomTask:
-            return "the producer"
+            return "the task producing"
         case is BuildKey.DirectoryContents, is BuildKey.FilteredDirectoryContents, is BuildKey.DirectoryTreeSignature, is BuildKey.Node:
-            return "an input"
+            return "an input of"
         case is BuildKey.Target, is BuildKey.Stat:
             return "<unexpected build key>"
         default:
@@ -2343,15 +2343,15 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
                 previousFrameID = nil
             case .signatureChanged:
                 category = .ruleSignatureChanged
-                description = "signature of \(descriptionForBuildKey(rule)) changed"
+                description = "arguments, environment, or working directory of \(descriptionForBuildKey(rule)) changed"
                 previousFrameID = nil
             case .invalidValue:
                 category = .ruleHadInvalidValue
                 previousFrameID = nil
                 if let command = rule as? BuildKey.Command, let task = lookupTask(TaskIdentifier(rawValue: command.name)), task.alwaysExecuteTask {
-                    description = "\(descriptionForBuildKey(rule)) is configured to run in every incremental build"
+                    description = "\(descriptionForBuildKey(rule)) was configured to run in every incremental build"
                 } else if rule is BuildKey.Command || rule is BuildKey.CustomTask {
-                    description = "\(descriptionForBuildKey(rule)) did not have up-to-date outputs"
+                    description = "outputs of \(descriptionForBuildKey(rule)) were missing or modified"
                 } else {
                     description = "\(descriptionForBuildKey(rule)) changed"
                 }
@@ -2361,7 +2361,7 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
                     if isTriggerNode(rule), let mutatedNodeDescription = descriptionOfInputMutatedByBuildKey(inputRule) {
                         description = "\(descriptionForBuildKey(inputRule)) mutated \(mutatedNodeDescription)"
                     } else {
-                        description = "\(inputNounPhraseForBuildKey(inputRule)) of \(descriptionForBuildKey(rule)) \(rebuiltVerbPhraseForBuildKey(inputRule))"
+                        description = "\(inputNounPhraseForBuildKey(inputRule)) \(descriptionForBuildKey(rule)) \(rebuiltVerbPhraseForBuildKey(inputRule))"
                     }
                     previousFrameID = previousFrameIdentifier
                 } else {
@@ -2370,7 +2370,7 @@ internal final class OperationSystemAdaptor: SWBLLBuild.BuildSystemDelegate, Act
                 }
             case .forced:
                 category = .ruleForced
-                description = "\(descriptionForBuildKey(rule)) was forced to run"
+                description = "\(descriptionForBuildKey(rule)) was forced to run to break a cycle in the build graph"
                 previousFrameID = nil
             @unknown default:
                 category = .none

Sources/SWBBuildSystem/DependencyCycleFormatter.swift

@@ -379,7 +379,7 @@ struct DependencyCycleFormatter {
                                     message = "Target '\(previousTargetName)' has an explicit dependency on Target '\(targetName)'"
                                 case let .implicitBuildPhaseLinkage(filename, _, buildPhase)?:
                                     message = "Target '\(previousTargetName)' has an implicit dependency on Target '\(targetName)' because '\(previousTargetName)' references the file '\(filename)' in the build phase '\(buildPhase)'"
-                                case let .implicitBuildSettingLinkage(settingName, options)?:
+                                case let .implicitBuildSetting(settingName, options)?:
                                     message = "Target '\(previousTargetName)' has an implicit dependency on Target '\(targetName)' because '\(previousTargetName)' defines the option '\(options.joined(separator: " "))' in the build setting '\(settingName)'"
                                 case let .impliedByTransitiveDependencyViaRemovedTargets(intermediateTargetName: intermediateTargetName):
                                     message = "Target '\(previousTargetName)' has a dependency on Target '\(targetName)' via its transitive dependency through '\(intermediateTargetName)'"
@@ -501,7 +501,7 @@ struct DependencyCycleFormatter {
                             suffix = " via the “Target Dependencies“ build phase"
                         case let .implicitBuildPhaseLinkage(filename, _, buildPhase)?:
                             suffix = " because the scheme has implicit dependencies enabled and the Target '\(lastTargetsName)' references the file '\(filename)' in the build phase '\(buildPhase)'"
-                        case let .implicitBuildSettingLinkage(settingName, options)?:
+                        case let .implicitBuildSetting(settingName, options)?:
                             suffix = " because the scheme has implicit dependencies enabled and the Target '\(lastTargetsName)' defines the options '\(options.joined(separator: " "))' in the build setting '\(settingName)'"
                         case let .impliedByTransitiveDependencyViaRemovedTargets(intermediateTargetName: intermediateTargetName):
                             suffix = " via its transitive dependency through '\(intermediateTargetName)'"

Sources/SWBCSupport/IndexStore.h

@@ -0,0 +1,190 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef INDEXSTORE_H
+#define INDEXSTORE_H
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <time.h>
+
+typedef void *indexstore_error_t;
+
+typedef struct {
+  const char *data;
+  size_t length;
+} indexstore_string_ref_t;
+
+typedef void *indexstore_t;
+typedef void *indexstore_symbol_t;
+
+typedef enum {
+  INDEXSTORE_SYMBOL_KIND_UNKNOWN = 0,
+  INDEXSTORE_SYMBOL_KIND_MODULE = 1,
+  INDEXSTORE_SYMBOL_KIND_NAMESPACE = 2,
+  INDEXSTORE_SYMBOL_KIND_NAMESPACEALIAS = 3,
+  INDEXSTORE_SYMBOL_KIND_MACRO = 4,
+  INDEXSTORE_SYMBOL_KIND_ENUM = 5,
+  INDEXSTORE_SYMBOL_KIND_STRUCT = 6,
+  INDEXSTORE_SYMBOL_KIND_CLASS = 7,
+  INDEXSTORE_SYMBOL_KIND_PROTOCOL = 8,
+  INDEXSTORE_SYMBOL_KIND_EXTENSION = 9,
+  INDEXSTORE_SYMBOL_KIND_UNION = 10,
+  INDEXSTORE_SYMBOL_KIND_TYPEALIAS = 11,
+  INDEXSTORE_SYMBOL_KIND_FUNCTION = 12,
+  INDEXSTORE_SYMBOL_KIND_VARIABLE = 13,
+  INDEXSTORE_SYMBOL_KIND_FIELD = 14,
+  INDEXSTORE_SYMBOL_KIND_ENUMCONSTANT = 15,
+  INDEXSTORE_SYMBOL_KIND_INSTANCEMETHOD = 16,
+  INDEXSTORE_SYMBOL_KIND_CLASSMETHOD = 17,
+  INDEXSTORE_SYMBOL_KIND_STATICMETHOD = 18,
+  INDEXSTORE_SYMBOL_KIND_INSTANCEPROPERTY = 19,
+  INDEXSTORE_SYMBOL_KIND_CLASSPROPERTY = 20,
+  INDEXSTORE_SYMBOL_KIND_STATICPROPERTY = 21,
+  INDEXSTORE_SYMBOL_KIND_CONSTRUCTOR = 22,
+  INDEXSTORE_SYMBOL_KIND_DESTRUCTOR = 23,
+  INDEXSTORE_SYMBOL_KIND_CONVERSIONFUNCTION = 24,
+  INDEXSTORE_SYMBOL_KIND_PARAMETER = 25,
+  INDEXSTORE_SYMBOL_KIND_USING = 26,
+
+  INDEXSTORE_SYMBOL_KIND_COMMENTTAG = 1000,
+} indexstore_symbol_kind_t;
+
+typedef enum {
+  INDEXSTORE_SYMBOL_PROPERTY_GENERIC                          = 1 << 0,
+  INDEXSTORE_SYMBOL_PROPERTY_TEMPLATE_PARTIAL_SPECIALIZATION  = 1 << 1,
+  INDEXSTORE_SYMBOL_PROPERTY_TEMPLATE_SPECIALIZATION          = 1 << 2,
+  INDEXSTORE_SYMBOL_PROPERTY_UNITTEST                         = 1 << 3,
+  INDEXSTORE_SYMBOL_PROPERTY_IBANNOTATED                      = 1 << 4,
+  INDEXSTORE_SYMBOL_PROPERTY_IBOUTLETCOLLECTION               = 1 << 5,
+  INDEXSTORE_SYMBOL_PROPERTY_GKINSPECTABLE                    = 1 << 6,
+  INDEXSTORE_SYMBOL_PROPERTY_LOCAL                            = 1 << 7,
+  INDEXSTORE_SYMBOL_PROPERTY_PROTOCOL_INTERFACE               = 1 << 8,
+  INDEXSTORE_SYMBOL_PROPERTY_SWIFT_ASYNC                      = 1 << 16,
+} indexstore_symbol_property_t;
+
+typedef enum {
+  INDEXSTORE_SYMBOL_ROLE_DECLARATION  = 1 << 0,
+  INDEXSTORE_SYMBOL_ROLE_DEFINITION   = 1 << 1,
+  INDEXSTORE_SYMBOL_ROLE_REFERENCE    = 1 << 2,
+  INDEXSTORE_SYMBOL_ROLE_READ         = 1 << 3,
+  INDEXSTORE_SYMBOL_ROLE_WRITE        = 1 << 4,
+  INDEXSTORE_SYMBOL_ROLE_CALL         = 1 << 5,
+  INDEXSTORE_SYMBOL_ROLE_DYNAMIC      = 1 << 6,
+  INDEXSTORE_SYMBOL_ROLE_ADDRESSOF    = 1 << 7,
+  INDEXSTORE_SYMBOL_ROLE_IMPLICIT     = 1 << 8,
+  INDEXSTORE_SYMBOL_ROLE_UNDEFINITION = 1 << 19,
+
+  // Relation roles.
+  INDEXSTORE_SYMBOL_ROLE_REL_CHILDOF     = 1 << 9,
+  INDEXSTORE_SYMBOL_ROLE_REL_BASEOF      = 1 << 10,
+  INDEXSTORE_SYMBOL_ROLE_REL_OVERRIDEOF  = 1 << 11,
+  INDEXSTORE_SYMBOL_ROLE_REL_RECEIVEDBY  = 1 << 12,
+  INDEXSTORE_SYMBOL_ROLE_REL_CALLEDBY    = 1 << 13,
+  INDEXSTORE_SYMBOL_ROLE_REL_EXTENDEDBY  = 1 << 14,
+  INDEXSTORE_SYMBOL_ROLE_REL_ACCESSOROF  = 1 << 15,
+  INDEXSTORE_SYMBOL_ROLE_REL_CONTAINEDBY = 1 << 16,
+  INDEXSTORE_SYMBOL_ROLE_REL_IBTYPEOF    = 1 << 17,
+  INDEXSTORE_SYMBOL_ROLE_REL_SPECIALIZATIONOF = 1 << 18,
+} indexstore_symbol_role_t;
+
+typedef void *indexstore_unit_dependency_t;
+
+typedef enum {
+  INDEXSTORE_UNIT_DEPENDENCY_UNIT = 1,
+  INDEXSTORE_UNIT_DEPENDENCY_RECORD = 2,
+  INDEXSTORE_UNIT_DEPENDENCY_FILE = 3,
+} indexstore_unit_dependency_kind_t;
+
+typedef void *indexstore_symbol_relation_t;
+typedef void *indexstore_occurrence_t;
+typedef void *indexstore_record_reader_t;
+typedef void *indexstore_unit_reader_t;
+
+typedef struct {
+  const char *
+  (*error_get_description)(indexstore_error_t);
+
+  void
+  (*error_dispose)(indexstore_error_t);
+
+  indexstore_t
+  (*store_create)(const char *store_path, indexstore_error_t *error);
+
+  void
+  (*store_dispose)(indexstore_t);
+
+  size_t
+    (*store_get_unit_name_from_output_path)(indexstore_t store,
+                                                    const char *output_path,
+                                                    char *name_buf,
+                                                    size_t buf_size);
+
+  indexstore_symbol_kind_t
+  (*symbol_get_kind)(indexstore_symbol_t);
+
+  uint64_t
+  (*symbol_get_properties)(indexstore_symbol_t);
+
+  indexstore_string_ref_t
+  (*symbol_get_name)(indexstore_symbol_t);
+
+  uint64_t
+  (*symbol_relation_get_roles)(indexstore_symbol_relation_t);
+
+  indexstore_symbol_t
+  (*symbol_relation_get_symbol)(indexstore_symbol_relation_t);
+
+  indexstore_symbol_t
+  (*occurrence_get_symbol)(indexstore_occurrence_t);
+
+  bool
+  (*occurrence_relations_apply_f)(indexstore_occurrence_t,
+                                          void *context,
+          bool(*applier)(void *context, indexstore_symbol_relation_t symbol_rel));
+
+  indexstore_record_reader_t
+  (*record_reader_create)(indexstore_t store, const char *record_name,
+                                  indexstore_error_t *error);
+
+  void
+  (*record_reader_dispose)(indexstore_record_reader_t);
+
+  bool
+  (*record_reader_occurrences_apply_f)(indexstore_record_reader_t,
+                                               void *context,
+                    bool(*applier)(void *context, indexstore_occurrence_t occur));
+
+  indexstore_unit_reader_t
+  (*unit_reader_create)(indexstore_t store, const char *unit_name,
+                                indexstore_error_t *error);
+
+  void
+  (*unit_reader_dispose)(indexstore_unit_reader_t);
+
+  indexstore_string_ref_t
+  (*unit_reader_get_module_name)(indexstore_unit_reader_t);
+
+  indexstore_unit_dependency_kind_t
+  (*unit_dependency_get_kind)(indexstore_unit_dependency_t);
+
+  indexstore_string_ref_t
+  (*unit_dependency_get_name)(indexstore_unit_dependency_t);
+
+  bool
+  (*unit_reader_dependencies_apply_f)(indexstore_unit_reader_t,
+                                              void *context,
+                      bool(*applier)(void *context, indexstore_unit_dependency_t));
+} swiftbuild_indexstore_functions_t;
+
+#endif

Sources/SWBCSupport/SWBCSupport.h

@@ -21,6 +21,7 @@
 
 #include "CLibclang.h"
 #include "CLibRemarksHelper.h"
+#include "IndexStore.h"
 #include "PluginAPI.h"
 #include "PluginAPI_functions.h"
 #include "PluginAPI_types.h"

Sources/SWBCore/Core.swift

@@ -245,6 +245,12 @@ public final class Core: Sendable {
                 // If the ProductBuildVersion key is missing, we use "UNKNOWN" as the value.
                 self.xcodeProductBuildVersion = info.productBuildVersion ?? ProductBuildVersion(major: 0, train: "A", build: 0, buildSuffix: "")
                 self.xcodeProductBuildVersionString = info.productBuildVersion?.description ?? "UNKNOWN"
+
+                // Enforce a minimum Xcode version for Open Source testing workflows
+                let minimumXcodeVersion = Version(16, 2)
+                if xcodeVersion < minimumXcodeVersion {
+                    throw StubError.error("This build of Swift Build requires a minimum Xcode version of \(minimumXcodeVersion.description) (current version: \(xcodeVersion.zeroTrimmed.description)).")
+                }
             } else {
                 // Set an arbitrary version for testing purposes.
                 self.xcodeVersion = Version(99, 99, 99)

Sources/SWBCore/Extensions/FeatureAvailabilityExtension.swift

@@ -21,5 +21,4 @@ public struct FeatureAvailabilityExtensionPoint: ExtensionPoint {
 }
 
 public protocol FeatureAvailabilityExtension: Sendable {
-    var supportsCompilationCaching: Bool { get }
 }