Rename traceFile to traceFilePath

Author: bob-wilson

Sources/SWBCore/SpecImplementations/Tools/CCompiler.swift

@@ -433,9 +433,9 @@ public struct ClangTaskPayload: ClangModuleVerifierPayloadType, DependencyInfoEd
     public let fileNameMapPath: Path?
 
     public let moduleDependenciesContext: ModuleDependenciesContext?
-    public let traceFile: Path?
+    public let traceFilePath: Path?
 
-    fileprivate init(serializedDiagnosticsPath: Path?, indexingPayload: ClangIndexingPayload?, explicitModulesPayload: ClangExplicitModulesPayload? = nil, outputObjectFilePath: Path? = nil, fileNameMapPath: Path? = nil, developerPathString: String? = nil, moduleDependenciesContext: ModuleDependenciesContext? = nil, traceFile: Path? = nil) {
+    fileprivate init(serializedDiagnosticsPath: Path?, indexingPayload: ClangIndexingPayload?, explicitModulesPayload: ClangExplicitModulesPayload? = nil, outputObjectFilePath: Path? = nil, fileNameMapPath: Path? = nil, developerPathString: String? = nil, moduleDependenciesContext: ModuleDependenciesContext? = nil, traceFilePath: Path? = nil) {
         if let developerPathString, explicitModulesPayload == nil {
             self.dependencyInfoEditPayload = .init(removablePaths: [], removableBasenames: [], developerPath: Path(developerPathString))
         } else {
@@ -447,7 +447,7 @@ public struct ClangTaskPayload: ClangModuleVerifierPayloadType, DependencyInfoEd
         self.outputObjectFilePath = outputObjectFilePath
         self.fileNameMapPath = fileNameMapPath
         self.moduleDependenciesContext = moduleDependenciesContext
-        self.traceFile = traceFile
+        self.traceFilePath = traceFilePath
     }
 
     public func serialize<T: Serializer>(to serializer: T) {
@@ -459,7 +459,7 @@ public struct ClangTaskPayload: ClangModuleVerifierPayloadType, DependencyInfoEd
             serializer.serialize(fileNameMapPath)
             serializer.serialize(dependencyInfoEditPayload)
             serializer.serialize(moduleDependenciesContext)
-            serializer.serialize(traceFile)
+            serializer.serialize(traceFilePath)
         }
     }
 
@@ -472,7 +472,7 @@ public struct ClangTaskPayload: ClangModuleVerifierPayloadType, DependencyInfoEd
         self.fileNameMapPath = try deserializer.deserialize()
         self.dependencyInfoEditPayload = try deserializer.deserialize()
         self.moduleDependenciesContext = try deserializer.deserialize()
-        self.traceFile = try deserializer.deserialize()
+        self.traceFilePath = try deserializer.deserialize()
     }
 }
 
@@ -1166,7 +1166,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
         }
 
         let moduleDependenciesContext = cbc.producer.moduleDependenciesContext
-        let traceFile: Path?
+        let traceFilePath: Path?
         if clangInfo?.hasFeature("print-headers-direct-per-file") ?? false,
             (moduleDependenciesContext?.validate ?? .defaultValue) != .no {
             let file = Path(outputNode.path.str + ".trace.json")
@@ -1176,9 +1176,9 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
                 "-Xclang", "-header-include-filtering=direct-per-file",
                 "-Xclang", "-header-include-format=json"
             ]
-            traceFile = file
+            traceFilePath = file
         } else {
-            traceFile = nil
+            traceFilePath = nil
         }
 
         // Add the diagnostics serialization flag.  We currently place the diagnostics file right next to the output object file.
@@ -1293,7 +1293,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible
             fileNameMapPath: verifierPayload?.fileNameMapPath,
             developerPathString: recordSystemHeaderDepsOutsideSysroot ? cbc.scope.evaluate(BuiltinMacros.DEVELOPER_DIR).str : nil,
             moduleDependenciesContext: moduleDependenciesContext,
-            traceFile: traceFile
+            traceFilePath: traceFilePath
         )
 
         var inputNodes: [any PlannedNode] = inputDeps.map { delegate.createNode($0) }

Sources/SWBTaskExecution/TaskActions/ClangCompileTaskAction.swift

@@ -249,16 +249,16 @@ public final class ClangCompileTaskAction: TaskAction, BuildValueValidatingTaskA
             }
 
             // Check if verifying dependencies from trace data is enabled.
-            var traceFile: Path? = nil
+            var traceFilePath: Path? = nil
             var moduleDependenciesContext: ModuleDependenciesContext? = nil
             if let payload = task.payload as? ClangTaskPayload {
-                traceFile = payload.traceFile
+                traceFilePath = payload.traceFilePath
                 moduleDependenciesContext = payload.moduleDependenciesContext
             }
-            if let traceFile {
+            if let traceFilePath {
                 // Remove the trace output file if it already exists.
-                if executionDelegate.fs.exists(traceFile) {
-                    try executionDelegate.fs.remove(traceFile)
+                if executionDelegate.fs.exists(traceFilePath) {
+                    try executionDelegate.fs.remove(traceFilePath)
                 }
             }
 
@@ -319,10 +319,10 @@ public final class ClangCompileTaskAction: TaskAction, BuildValueValidatingTaskA
                 }
             }
 
-            if let moduleDependenciesContext, let traceFile, lastResult == .succeeded {
+            if let moduleDependenciesContext, let traceFilePath, lastResult == .succeeded {
                 // Verify the dependencies from the trace data.
                 let fs = executionDelegate.fs
-                let traceData = try JSONDecoder().decode(Array<TraceData>.self, from: fs.readMemoryMapped(traceFile))
+                let traceData = try JSONDecoder().decode(Array<TraceData>.self, from: fs.readMemoryMapped(traceFilePath))
 
                 var allFiles = Set<Path>()
                 traceData.forEach { allFiles.formUnion(Set($0.includes)) }