Move project identity matching to a plugin

jakepetroules · jakepetroules · commit dc3aeccac5ad · 2025-12-03T13:02:21.000-08:00
These are behaviors specific to certain environments that don't belong in the core logic.
diff --git a/Sources/SWBApplePlatform/Plugin.swift b/Sources/SWBApplePlatform/Plugin.swift
@@ -262,13 +262,4 @@ struct AppleSettingsBuilderExtension: SettingsBuilderExtension {
         let constValueProtocols = [appIntentsProtocols, extensionKitProtocols].joined(separator: " ")
         return ["SWIFT_EMIT_CONST_VALUE_PROTOCOLS" : constValueProtocols]
     }
-    func addOverrides(fromEnvironment: [String : String], parameters: BuildParameters) throws -> [String : String] { [:] }
-    func addProductTypeDefaults(productType: ProductTypeSpec) -> [String : String] { [:] }
-    func addSDKOverridingSettings(_ sdk: SDK, _ variant: SDKVariant?, _ sparseSDKs: [SDK], specLookupContext: any SWBCore.SpecLookupContext, environment: [String: String]) throws -> [String : String] { [:] }
-    func addPlatformSDKSettings(_ platform: SWBCore.Platform?, _ sdk: SDK, _ sdkVariant: SDKVariant?) -> [String : String] { [:] }
-    func xcconfigOverrideData(fromParameters: BuildParameters) -> ByteString { ByteString() }
-    func getTargetTestingSwiftPluginFlags(_ scope: MacroEvaluationScope, toolchainRegistry: ToolchainRegistry, sdkRegistry: SDKRegistry, activeRunDestination: RunDestinationInfo?, project: SWBCore.Project?) -> [String] { [] }
-    func shouldSkipPopulatingValidArchs(platform: SWBCore.Platform, sdk: SDK?) -> Bool { false }
-    func shouldDisableXOJITPreviews(platformName: String, sdk: SDK?) -> Bool { false }
-    func overridingBuildSettings(_: MacroEvaluationScope, platform: SWBCore.Platform?, productType: ProductTypeSpec) -> [String : String] { [:] }
 }
diff --git a/Sources/SWBCore/Extensions/SettingsBuilderExtension.swift b/Sources/SWBCore/Extensions/SettingsBuilderExtension.swift
@@ -53,4 +53,21 @@ public protocol SettingsBuilderExtension: Sendable {
     func shouldDisableXOJITPreviews(platformName: String, sdk: SDK?) -> Bool
 
     func overridingBuildSettings(_: MacroEvaluationScope, platform: Platform?, productType: ProductTypeSpec) -> [String: String]
+
+    func matchesAnyProjectIdentities(scope: MacroEvaluationScope, projectIdentities: Set<String>) -> Bool
+}
+
+extension SettingsBuilderExtension {
+    public func addOverrides(fromEnvironment: [String: String], parameters: BuildParameters) throws -> [String: String] { [:] }
+    public func addBuiltinDefaults(fromEnvironment environment: [String: String], parameters: BuildParameters) throws -> [String: String] { [:] }
+    public func addProductTypeDefaults(productType: ProductTypeSpec) -> [String: String] { [:] }
+    public func addSDKSettings(_ sdk: SDK, _ variant: SDKVariant?, _ sparseSDKs: [SDK]) throws -> [String: String] { [:] }
+    public func addSDKOverridingSettings(_ sdk: SDK, _ variant: SDKVariant?, _ sparseSDKs: [SDK], specLookupContext: any SWBCore.SpecLookupContext, environment: [String: String]) throws -> [String: String] { [:] }
+    public func addPlatformSDKSettings(_ platform: SWBCore.Platform?, _ sdk: SDK, _ sdkVariant: SDKVariant?) -> [String: String] { [:] }
+    public func xcconfigOverrideData(fromParameters: BuildParameters) -> ByteString { ByteString() }
+    public func getTargetTestingSwiftPluginFlags(_ scope: MacroEvaluationScope, toolchainRegistry: ToolchainRegistry, sdkRegistry: SDKRegistry, activeRunDestination: RunDestinationInfo?, project: SWBCore.Project?) -> [String] { [] }
+    public func shouldSkipPopulatingValidArchs(platform: SWBCore.Platform, sdk: SDK?) -> Bool { false }
+    public func shouldDisableXOJITPreviews(platformName: String, sdk: SDK?) -> Bool { false }
+    public func overridingBuildSettings(_: MacroEvaluationScope, platform: SWBCore.Platform?, productType: ProductTypeSpec) -> [String: String] { [:] }
+    public func matchesAnyProjectIdentities(scope: MacroEvaluationScope, projectIdentities: Set<String>) -> Bool { false }
 }
diff --git a/Sources/SWBCore/Settings/BuiltinMacros.swift b/Sources/SWBCore/Settings/BuiltinMacros.swift
@@ -1210,8 +1210,6 @@ public final class BuiltinMacros {
     public static let TARGET_DEVICE_PLATFORM_NAME = BuiltinMacros.declareStringMacro("TARGET_DEVICE_PLATFORM_NAME")
 
     public static let RC_ARCHS = BuiltinMacros.declareStringListMacro("RC_ARCHS")
-    public static let RC_BASE_PROJECT_NAME = BuiltinMacros.declareStringMacro("RC_BASE_PROJECT_NAME")
-    public static let RC_ProjectName = BuiltinMacros.declareStringMacro("RC_ProjectName")
 
     // LLVM Target
     public static let LLVM_TARGET_TRIPLE_OS_VERSION = BuiltinMacros.declareStringMacro("LLVM_TARGET_TRIPLE_OS_VERSION")
@@ -2140,8 +2138,6 @@ public final class BuiltinMacros {
         PUBLIC_HEADERS_FOLDER_PATH,
         ProductResourcesDir,
         RC_ARCHS,
-        RC_BASE_PROJECT_NAME,
-        RC_ProjectName,
         RECORD_SYSTEM_HEADER_DEPENDENCIES_OUTSIDE_SYSROOT,
         RECURSIVE_SEARCH_PATHS_FOLLOW_SYMLINKS,
         MAKE_MERGEABLE,
diff --git a/Sources/SWBCore/Settings/Settings.swift b/Sources/SWBCore/Settings/Settings.swift
@@ -1176,7 +1176,11 @@ public struct SettingsContext: Sendable {
 }
 
 /// This class is responsible for construction of the build settings to use when evaluate macros for a project or target.
-private class SettingsBuilder {
+private class SettingsBuilder: ProjectMatchLookup {
+    func matchesAnyProjectIdentities(scope: SWBMacro.MacroEvaluationScope, projectIdentities: Set<String>) -> Bool {
+        workspaceContext.core.pluginManager.extensions(of: SettingsBuilderExtensionPoint.self).contains(where: { ext in ext.matchesAnyProjectIdentities(scope: scope, projectIdentities: projectIdentities) })
+    }
+
     /// This struct wraps properties which are bound as a result of the input parameters and then used to compute the full settings.
     struct BoundProperties {
 
@@ -1664,7 +1668,7 @@ private class SettingsBuilder {
         }
 
         if scope.evaluate(BuiltinMacros.ENABLE_PROJECT_OVERRIDE_SPECS), let projectOverrideSpec = core.specRegistry.findSpecs(ProjectOverridesSpec.self, domain: "").filter({ spec in
-            spec.projectName == (scope.evaluate(BuiltinMacros.RC_ProjectName).nilIfEmpty ?? scope.evaluate(BuiltinMacros.SRCROOT).basename)
+            matchesAnyProjectIdentities(scope: scope, projectIdentities: [spec.projectName])
         }).only {
             push(projectOverrideSpec.buildSettings)
             self.warnings.append("Applying Swift Build settings override to project for \(projectOverrideSpec.bugReport).")
diff --git a/Sources/SWBCore/SpecImplementations/CompilerSpec.swift b/Sources/SWBCore/SpecImplementations/CompilerSpec.swift
@@ -108,18 +108,9 @@ protocol ProjectFailuresBlockList {
 }
 
 extension ProjectFailuresBlockList {
-    func isProjectListed(_ scope: MacroEvaluationScope) -> Bool {
+    func isProjectListed(_ producer: any CommandProducer, _ scope: MacroEvaluationScope) -> Bool {
         // Check if this project is on the blocklist.
-        let RC_ProjectName = scope.evaluate(BuiltinMacros.RC_ProjectName)
-        if !RC_ProjectName.isEmpty, KnownFailures.contains(RC_ProjectName) {
-            return true
-        }
-        let RC_BaseProjectName = scope.evaluate(BuiltinMacros.RC_BASE_PROJECT_NAME)
-        if !RC_BaseProjectName.isEmpty, KnownFailures.contains(RC_BaseProjectName) {
-            return true
-        }
-        let projectName = scope.evaluate(BuiltinMacros.PROJECT_NAME)
-        return KnownFailures.contains(projectName)
+        producer.matchesAnyProjectIdentities(scope: scope, projectIdentities: Set(KnownFailures))
     }
 }
 
diff --git a/Sources/SWBCore/SpecImplementations/Tools/CCompiler.swift b/Sources/SWBCore/SpecImplementations/Tools/CCompiler.swift
@@ -904,7 +904,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         let buildSettingEnabled = cbc.scope.evaluate(BuiltinMacros.CLANG_ENABLE_COMPILE_CACHE)
 
         // If this project is on the blocklist, override the blocklist default enable for it.
-        return clangInfo?.isCachingBlocked(cbc.scope) == true ? false : buildSettingEnabled
+        return clangInfo?.isCachingBlocked(cbc.producer, cbc.scope) == true ? false : buildSettingEnabled
     }
 
     private func createExplicitModulesActionAndPayload(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate, _ compilerLauncher: Path?, _ input: FileToBuild, _ language: GCCCompatibleLanguageDialect?, commandLine: [String], scanningOutputPath: Path, isForPCHTask: Bool, clangInfo: DiscoveredClangToolSpecInfo?) -> (action: (any PlannedTaskAction)?, usesExecutionInputs: Bool, payload: ClangExplicitModulesPayload?, signatureData: String?) {
diff --git a/Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift b/Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift
@@ -1408,7 +1408,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                                   scope.evaluate(BuiltinMacros._EXPERIMENTAL_SWIFT_EXPLICIT_MODULES) == .enabled
 
         // If this project is on the blocklist, override the blocklist default enable for it
-        if let explicitModuleBlocklist = await getExplicitModuleBlocklist(producer, scope, delegate), explicitModuleBlocklist.isProjectListed(scope) {
+        if let explicitModuleBlocklist = await getExplicitModuleBlocklist(producer, scope, delegate), explicitModuleBlocklist.isProjectListed(producer, scope) {
             return false
         }
 
@@ -1463,7 +1463,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
                 if blocklist.Modules.contains(moduleName) {
                     return false
                 }
-                if blocklist.isProjectListed(cbc.scope) {
+                if blocklist.isProjectListed(cbc.producer, cbc.scope) {
                     return false
                 }
             }
diff --git a/Sources/SWBCore/TaskGeneration.swift b/Sources/SWBCore/TaskGeneration.swift
@@ -97,8 +97,12 @@ extension PlatformBuildContext {
     }
 }
 
+public protocol ProjectMatchLookup {
+    func matchesAnyProjectIdentities(scope: MacroEvaluationScope, projectIdentities: Set<String>) -> Bool
+}
+
 /// Protocol describing the interface producers use to communicate information to the command build context.
-public protocol CommandProducer: PlatformBuildContext, SpecLookupContext, ReferenceLookupContext, PlatformInfoLookup {
+public protocol CommandProducer: PlatformBuildContext, SpecLookupContext, ReferenceLookupContext, PlatformInfoLookup, ProjectMatchLookup {
     /// The configured target the command is being produced for, if any.
     var configuredTarget: ConfiguredTarget? { get }
 
diff --git a/Sources/SWBCore/ToolInfo/ClangToolInfo.swift b/Sources/SWBCore/ToolInfo/ClangToolInfo.swift
@@ -38,9 +38,9 @@ public struct ClangBlocklists : Sendable {
     var builtinModuleVerify: BuiltinModuleVerifierInfo? = nil
 
     /// Helper method for determining if a given functionality is blocklisted for the active scope.
-    func isBlocked<BlockListT: ProjectFailuresBlockList>(_ scope: MacroEvaluationScope, info: BlockListT?) -> Bool {
+    func isBlocked<BlockListT: ProjectFailuresBlockList>(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, info: BlockListT?) -> Bool {
         guard let blocklistInfo = info else { return false }
-        return blocklistInfo.isProjectListed(scope)
+        return blocklistInfo.isProjectListed(producer, scope)
     }
 }
 
@@ -98,12 +98,12 @@ public struct DiscoveredClangToolSpecInfo: DiscoveredCommandLineToolSpecInfo {
         Set(toolFeatures.value(.deploymentTargetEnvironmentVariables)?.stringArrayValue ?? [])
     }
 
-    public func isCachingBlocked(_ scope: MacroEvaluationScope) -> Bool {
-        return blocklists.isBlocked(scope, info: blocklists.caching)
+    public func isCachingBlocked(_ producer: any CommandProducer, _ scope: MacroEvaluationScope) -> Bool {
+        return blocklists.isBlocked(producer, scope, info: blocklists.caching)
      }
 
-    public func isBuiltinModuleVerifyBlocked(_ scope: MacroEvaluationScope) -> Bool {
-        return blocklists.isBlocked(scope, info: blocklists.builtinModuleVerify)
+    public func isBuiltinModuleVerifyBlocked(_ producer: any CommandProducer, _ scope: MacroEvaluationScope) -> Bool {
+        return blocklists.isBlocked(producer, scope, info: blocklists.builtinModuleVerify)
     }
 }
 
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ModuleVerifierTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ModuleVerifierTaskProducer.swift
@@ -150,7 +150,7 @@ final class ModuleVerifierTaskProducer: PhasedTaskProducer, TaskProducer {
                     return
                 }
                 // Fallback to external verifier if current scope is blocklisted.
-                if clangInfo?.isBuiltinModuleVerifyBlocked(scope) == true {
+                if clangInfo?.isBuiltinModuleVerifyBlocked(context, scope) == true {
                     fallbackToExternal = true
                     return
                 }
diff --git a/Sources/SWBTaskConstruction/TaskProducers/TaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/TaskProducer.swift
@@ -1428,6 +1428,10 @@ extension TaskProducerContext: CommandProducer {
     public func lookupLibclang(path: SWBUtil.Path) -> (libclang: SWBCore.Libclang?, version: Version?) {
         workspaceContext.core.lookupLibclang(path: path)
     }
+
+    public func matchesAnyProjectIdentities(scope: SWBMacro.MacroEvaluationScope, projectIdentities: Set<String>) -> Bool {
+        workspaceContext.core.pluginManager.extensions(of: SettingsBuilderExtensionPoint.self).contains(where: { ext in ext.matchesAnyProjectIdentities(scope: scope, projectIdentities: projectIdentities) })
+    }
 }
 
 extension TaskProducerContext {
diff --git a/Sources/SWBTestSupport/DummyCommandProducer.swift b/Sources/SWBTestSupport/DummyCommandProducer.swift
@@ -252,4 +252,8 @@ package struct MockCommandProducer: CommandProducer, Sendable {
     package var headerDependenciesContext: SWBCore.HeaderDependenciesContext? {
         nil
     }
+
+    package func matchesAnyProjectIdentities(scope: SWBMacro.MacroEvaluationScope, projectIdentities: Set<String>) -> Bool {
+        false
+    }
 }
diff --git a/Tests/SWBBuildSystemTests/ClangCompilationCachingTests.swift b/Tests/SWBBuildSystemTests/ClangCompilationCachingTests.swift
@@ -13,6 +13,7 @@
 import Testing
 
 import SWBCore
+import SWBMacro
 import SWBProtocol
 import SWBTaskExecution
 import SWBTestSupport
@@ -644,7 +645,17 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
             }
 
             do {
-                let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
+                // Construct a custom core to test project identity based matching
+                let core = try await Self.makeCore(registerExtraPlugins: { pluginManager in
+                    struct TestSettingsBuilderExtension: SettingsBuilderExtension {
+                        func matchesAnyProjectIdentities(scope: MacroEvaluationScope, projectIdentities: Set<String>) -> Bool {
+                            projectIdentities.contains(scope.evaluate(BuiltinMacros.PROJECT_NAME))
+                        }
+                    }
+                    pluginManager.register(TestSettingsBuilderExtension(), type: SettingsBuilderExtensionPoint.self)
+                })
+
+                let tester = try await BuildOperationTester(core, testWorkspace, simulated: false)
                 try await tester.fs.writeFileContents(testWorkspace.sourceRoot.join("aProject/file.c")) { stream in
                     stream <<< "void foo(void) {}"
                 }
diff --git a/Tests/SWBBuildSystemTests/SwiftDriverTests.swift b/Tests/SWBBuildSystemTests/SwiftDriverTests.swift
@@ -20,6 +20,7 @@ import SwiftBuildTestSupport
 import SWBLLBuild
 
 import SWBCore
+import SWBMacro
 import SWBTaskExecution
 
 @Suite
@@ -884,7 +885,17 @@ fileprivate struct SwiftDriverTests: CoreBasedTests {
                 try await tester.checkBuild(runDestination: .macOS, buildRequest: cleanRequest) { results in results.checkNoErrors() }
             }
 
-            tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
+            // Construct a custom core to test project identity based matching
+            let customCore = try await Self.makeCore(registerExtraPlugins: { pluginManager in
+                struct TestSettingsBuilderExtension: SettingsBuilderExtension {
+                    func matchesAnyProjectIdentities(scope: MacroEvaluationScope, projectIdentities: Set<String>) -> Bool {
+                        projectIdentities.contains(scope.evaluate(BuiltinMacros.SRCROOT).basename)
+                    }
+                }
+                pluginManager.register(TestSettingsBuilderExtension(), type: SettingsBuilderExtensionPoint.self)
+            })
+
+            tester = try await BuildOperationTester(customCore, testWorkspace, simulated: false)
             do {
                 // Add project name to the `KnownFailures` and ensure explicit modules are disabled despite the build setting enable
                 let buildParameters = BuildParameters(configuration: "Debug",
diff --git a/Tests/SWBTaskConstructionTests/ModuleVerifierTaskConstructionTests.swift b/Tests/SWBTaskConstructionTests/ModuleVerifierTaskConstructionTests.swift
@@ -14,6 +14,7 @@ import struct Foundation.Data
 
 import SWBProtocol
 import SWBCore
+import SWBMacro
 import SWBTaskConstruction
 import SWBTestSupport
 import SWBUtil
@@ -704,7 +705,16 @@ fileprivate struct ModuleVerifierTaskConstructionTests: CoreBasedTests {
                     ]),
                 ])
 
-                let core = try await getCore()
+                // Construct a custom core to test project identity based matching
+                let core = try await Self.makeCore(registerExtraPlugins: { pluginManager in
+                    struct TestSettingsBuilderExtension: SettingsBuilderExtension {
+                        func matchesAnyProjectIdentities(scope: MacroEvaluationScope, projectIdentities: Set<String>) -> Bool {
+                            projectIdentities.contains(scope.evaluate(BuiltinMacros.PROJECT_NAME))
+                        }
+                    }
+                    pluginManager.register(TestSettingsBuilderExtension(), type: SettingsBuilderExtensionPoint.self)
+                })
+
                 let tester = try await BuildOperationTester(core, testProject, simulated: false)
                 let SRCROOT = tester.workspace.projects[0].sourceRoot
                 for inputFile in ["Sources/Orange.h", "Sources/Orange.defs", "Sources/main.m"] {

Original file line number	Diff line number	Diff line change
`@@ -262,13 +262,4 @@ struct AppleSettingsBuilderExtension: SettingsBuilderExtension {`
`262`	`262`	`let constValueProtocols = [appIntentsProtocols, extensionKitProtocols].joined(separator: " ")`
`263`	`263`	`return ["SWIFT_EMIT_CONST_VALUE_PROTOCOLS" : constValueProtocols]`
`264`	`264`	`}`
`265`		`- func addOverrides(fromEnvironment: [String : String], parameters: BuildParameters) throws -> [String : String] { [:] }`
`266`		`- func addProductTypeDefaults(productType: ProductTypeSpec) -> [String : String] { [:] }`
`267`		`- func addSDKOverridingSettings(_ sdk: SDK, _ variant: SDKVariant?, _ sparseSDKs: [SDK], specLookupContext: any SWBCore.SpecLookupContext, environment: [String: String]) throws -> [String : String] { [:] }`
`268`		`- func addPlatformSDKSettings(_ platform: SWBCore.Platform?, _ sdk: SDK, _ sdkVariant: SDKVariant?) -> [String : String] { [:] }`
`269`		`- func xcconfigOverrideData(fromParameters: BuildParameters) -> ByteString { ByteString() }`
`270`		`- func getTargetTestingSwiftPluginFlags(_ scope: MacroEvaluationScope, toolchainRegistry: ToolchainRegistry, sdkRegistry: SDKRegistry, activeRunDestination: RunDestinationInfo?, project: SWBCore.Project?) -> [String] { [] }`
`271`		`- func shouldSkipPopulatingValidArchs(platform: SWBCore.Platform, sdk: SDK?) -> Bool { false }`
`272`		`- func shouldDisableXOJITPreviews(platformName: String, sdk: SDK?) -> Bool { false }`
`273`		`- func overridingBuildSettings(_: MacroEvaluationScope, platform: SWBCore.Platform?, productType: ProductTypeSpec) -> [String : String] { [:] }`
`274`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,18 +108,9 @@ protocol ProjectFailuresBlockList {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`extension ProjectFailuresBlockList {`
`111`		`- func isProjectListed(_ scope: MacroEvaluationScope) -> Bool {`
	`111`	`+ func isProjectListed(_ producer: any CommandProducer, _ scope: MacroEvaluationScope) -> Bool {`
`112`	`112`	`// Check if this project is on the blocklist.`
`113`		`- let RC_ProjectName = scope.evaluate(BuiltinMacros.RC_ProjectName)`
`114`		`- if !RC_ProjectName.isEmpty, KnownFailures.contains(RC_ProjectName) {`
`115`		`- return true`
`116`		`- }`
`117`		`- let RC_BaseProjectName = scope.evaluate(BuiltinMacros.RC_BASE_PROJECT_NAME)`
`118`		`- if !RC_BaseProjectName.isEmpty, KnownFailures.contains(RC_BaseProjectName) {`
`119`		`- return true`
`120`		`- }`
`121`		`- let projectName = scope.evaluate(BuiltinMacros.PROJECT_NAME)`
`122`		`- return KnownFailures.contains(projectName)`
	`113`	`+ producer.matchesAnyProjectIdentities(scope: scope, projectIdentities: Set(KnownFailures))`
`123`	`114`	`}`
`124`	`115`	`}`
`125`	`116`
Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible`
`904`	`904`	`let buildSettingEnabled = cbc.scope.evaluate(BuiltinMacros.CLANG_ENABLE_COMPILE_CACHE)`
`905`	`905`
`906`	`906`	`// If this project is on the blocklist, override the blocklist default enable for it.`
`907`		`- return clangInfo?.isCachingBlocked(cbc.scope) == true ? false : buildSettingEnabled`
	`907`	`+ return clangInfo?.isCachingBlocked(cbc.producer, cbc.scope) == true ? false : buildSettingEnabled`
`908`	`908`	`}`
`909`	`909`
`910`	`910`	`private func createExplicitModulesActionAndPayload(_ cbc: CommandBuildContext, _ delegate: any TaskGenerationDelegate, _ compilerLauncher: Path?, _ input: FileToBuild, _ language: GCCCompatibleLanguageDialect?, commandLine: [String], scanningOutputPath: Path, isForPCHTask: Bool, clangInfo: DiscoveredClangToolSpecInfo?) -> (action: (any PlannedTaskAction)?, usesExecutionInputs: Bool, payload: ClangExplicitModulesPayload?, signatureData: String?) {`
Original file line number	Diff line number	Diff line change
`@@ -1408,7 +1408,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi`
`1408`	`1408`	`scope.evaluate(BuiltinMacros._EXPERIMENTAL_SWIFT_EXPLICIT_MODULES) == .enabled`
`1409`	`1409`
`1410`	`1410`	`// If this project is on the blocklist, override the blocklist default enable for it`
`1411`		`- if let explicitModuleBlocklist = await getExplicitModuleBlocklist(producer, scope, delegate), explicitModuleBlocklist.isProjectListed(scope) {`
	`1411`	`+ if let explicitModuleBlocklist = await getExplicitModuleBlocklist(producer, scope, delegate), explicitModuleBlocklist.isProjectListed(producer, scope) {`
`1412`	`1412`	`return false`
`1413`	`1413`	`}`
`1414`	`1414`
`@@ -1463,7 +1463,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi`
`1463`	`1463`	`if blocklist.Modules.contains(moduleName) {`
`1464`	`1464`	`return false`
`1465`	`1465`	`}`
`1466`		`- if blocklist.isProjectListed(cbc.scope) {`
	`1466`	`+ if blocklist.isProjectListed(cbc.producer, cbc.scope) {`
`1467`	`1467`	`return false`
`1468`	`1468`	`}`
`1469`	`1469`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,12 @@ extension PlatformBuildContext {`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
	`100`	`+public protocol ProjectMatchLookup {`
	`101`	`+ func matchesAnyProjectIdentities(scope: MacroEvaluationScope, projectIdentities: Set<String>) -> Bool`
	`102`	`+}`
	`103`	`+`
`100`	`104`	`/// Protocol describing the interface producers use to communicate information to the command build context.`
`101`		`-public protocol CommandProducer: PlatformBuildContext, SpecLookupContext, ReferenceLookupContext, PlatformInfoLookup {`
	`105`	`+public protocol CommandProducer: PlatformBuildContext, SpecLookupContext, ReferenceLookupContext, PlatformInfoLookup, ProjectMatchLookup {`
`102`	`106`	`/// The configured target the command is being produced for, if any.`
`103`	`107`	`var configuredTarget: ConfiguredTarget? { get }`
`104`	`108`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ public struct ClangBlocklists : Sendable {`
`38`	`38`	`var builtinModuleVerify: BuiltinModuleVerifierInfo? = nil`
`39`	`39`
`40`	`40`	`/// Helper method for determining if a given functionality is blocklisted for the active scope.`
`41`		`- func isBlocked<BlockListT: ProjectFailuresBlockList>(_ scope: MacroEvaluationScope, info: BlockListT?) -> Bool {`
	`41`	`+ func isBlocked<BlockListT: ProjectFailuresBlockList>(_ producer: any CommandProducer, _ scope: MacroEvaluationScope, info: BlockListT?) -> Bool {`
`42`	`42`	`guard let blocklistInfo = info else { return false }`
`43`		`- return blocklistInfo.isProjectListed(scope)`
	`43`	`+ return blocklistInfo.isProjectListed(producer, scope)`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`@@ -98,12 +98,12 @@ public struct DiscoveredClangToolSpecInfo: DiscoveredCommandLineToolSpecInfo {`
`98`	`98`	`Set(toolFeatures.value(.deploymentTargetEnvironmentVariables)?.stringArrayValue ?? [])`
`99`	`99`	`}`
`100`	`100`
`101`		`- public func isCachingBlocked(_ scope: MacroEvaluationScope) -> Bool {`
`102`		`- return blocklists.isBlocked(scope, info: blocklists.caching)`
	`101`	`+ public func isCachingBlocked(_ producer: any CommandProducer, _ scope: MacroEvaluationScope) -> Bool {`
	`102`	`+ return blocklists.isBlocked(producer, scope, info: blocklists.caching)`
`103`	`103`	`}`
`104`	`104`
`105`		`- public func isBuiltinModuleVerifyBlocked(_ scope: MacroEvaluationScope) -> Bool {`
`106`		`- return blocklists.isBlocked(scope, info: blocklists.builtinModuleVerify)`
	`105`	`+ public func isBuiltinModuleVerifyBlocked(_ producer: any CommandProducer, _ scope: MacroEvaluationScope) -> Bool {`
	`106`	`+ return blocklists.isBlocked(producer, scope, info: blocklists.builtinModuleVerify)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ final class ModuleVerifierTaskProducer: PhasedTaskProducer, TaskProducer {`
`150`	`150`	`return`
`151`	`151`	`}`
`152`	`152`	`// Fallback to external verifier if current scope is blocklisted.`
`153`		`- if clangInfo?.isBuiltinModuleVerifyBlocked(scope) == true {`
	`153`	`+ if clangInfo?.isBuiltinModuleVerifyBlocked(context, scope) == true {`
`154`	`154`	`fallbackToExternal = true`
`155`	`155`	`return`
`156`	`156`	`}`