Skip to content

Commit 82ba595

Browse files
committed
Upstream trivial diffs
withSerializationContext needs to be exposed to tests, and BuildService.run needs to build and do so without warnings regardless of whether USE_STATIC_PLUGIN_INITIALIZATION is set.
1 parent edfb4b3 commit 82ba595

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Sources/SWBBuildService/BuildServiceEntryPoint.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ extension BuildService {
9595
///
9696
/// Called directly from the exported C entry point `swiftbuildServiceEntryPoint` for in-process connections, or from `BuildService.main()` (after some basic file descriptor setup) for out-of-process connections.
9797
fileprivate static func run(inputFD: FileDescriptor, outputFD: FileDescriptor, connectionMode: ServiceHostConnectionMode, pluginsDirectory: URL?, arguments: [String], pluginLoadingFinished: () throws -> Void) async throws {
98-
let pluginManager = await { @PluginExtensionSystemActor in
98+
let pluginManager = try await { @PluginExtensionSystemActor () async throws in
9999
// Create the plugin manager and load plugins.
100100
let pluginManager = PluginManager(skipLoadingPluginIdentifiers: [])
101101

Sources/SWBTaskExecution/BuildDescription.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ package final class TaskActionRegistry: Sendable {
13981398
implementations = try TaskActionExtensionPoint.taskActionImplementations(pluginManager: pluginManager)
13991399
}
14001400

1401-
func withSerializationContext<T>(_ block: () throws -> T) rethrows -> T {
1401+
@_spi(Testing) public func withSerializationContext<T>(_ block: () throws -> T) rethrows -> T {
14021402
try TaskAction.$taskActionImplementations.withValue(implementations) {
14031403
try block()
14041404
}

0 commit comments

Comments
 (0)