Skip to content

Commit 3ab998c

Browse files
authored
Merge pull request #471 from artemcm/NoVirtualSourceFilesHere
[Dependency Scanning] Do not decode `sourceFiles` fileds of the inter-module dependency graph into VirtualPaths
2 parents 9b20c9d + 376dd63 commit 3ab998c

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Sources/SwiftDriver/ExplicitModuleBuilds/InterModuleDependencies/InterModuleDependencyGraph.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public struct ModuleInfo: Codable {
167167
public var modulePath: TextualVirtualPath
168168

169169
/// The source files used to build this module.
170-
public var sourceFiles: [TextualVirtualPath]?
170+
public var sourceFiles: [String]?
171171

172172
/// The set of direct module dependencies of this module.
173173
public var directDependencies: [ModuleDependencyId]?
@@ -193,7 +193,7 @@ public struct ModuleInfo: Codable {
193193
}
194194

195195
public init(modulePath: TextualVirtualPath,
196-
sourceFiles: [TextualVirtualPath]?,
196+
sourceFiles: [String]?,
197197
directDependencies: [ModuleDependencyId]?,
198198
details: Details) {
199199
self.modulePath = modulePath

Sources/SwiftDriver/SwiftScan/DependencyGraphBuilder.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,9 @@ private extension SwiftScan {
8989
// Decode module path and source file locations
9090
let modulePathStr = try toSwiftString(api.swiftscan_module_info_get_module_path(moduleInfoRef))
9191
let modulePath = TextualVirtualPath(path: try VirtualPath(path: modulePathStr))
92-
let sourceFiles: [TextualVirtualPath]?
92+
let sourceFiles: [String]?
9393
if let sourceFilesSetRef = api.swiftscan_module_info_get_source_files(moduleInfoRef) {
94-
sourceFiles = try toSwiftStringArray(sourceFilesSetRef.pointee).map {
95-
TextualVirtualPath(path: try VirtualPath(path: $0))
96-
}
94+
sourceFiles = try toSwiftStringArray(sourceFilesSetRef.pointee)
9795
} else {
9896
sourceFiles = nil
9997
}

0 commit comments

Comments
 (0)