Merge pull request #13 from apple/master

merge upstream

Author: sjavora

Sources/SwiftDriver/Driver/Driver.swift

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 import TSCBasic
 import TSCUtility
+import Foundation
 
 /// How should the Swift module output be handled?
 public enum ModuleOutput: Equatable {
@@ -46,7 +47,7 @@ public struct Driver {
     case subcommandPassedToDriver
     case relativeFrontendPath(String)
   }
-  
+
   /// The set of environment variables that are visible to the driver and
   /// processes it launches. This is a hook for testing; in actual use
   /// it should be identical to the real environment.
@@ -79,6 +80,9 @@ public struct Driver {
   /// The set of input files
   public let inputFiles: [TypedVirtualPath]
 
+  /// The last time each input file was modified, recorded at the start of the build.
+  public let recordedInputModificationDates: [TypedVirtualPath: Date]
+
   /// The mapping from input files to output files for each kind.
   internal let outputFileMap: OutputFileMap?
 
@@ -246,14 +250,28 @@ public struct Driver {
     // Classify and collect all of the input files.
     let inputFiles = try Self.collectInputFiles(&self.parsedOptions)
     self.inputFiles = inputFiles
+    self.recordedInputModificationDates = .init(uniqueKeysWithValues:
+      Set(inputFiles).compactMap {
+        if case .absolute(let absolutePath) = $0.file,
+          let modTime = try? localFileSystem.getFileInfo(absolutePath).modTime {
+          return ($0, modTime)
+        }
+        return nil
+    })
 
+    let outputFileMap: OutputFileMap?
     // Initialize an empty output file map, which will be populated when we start creating jobs.
     if let outputFileMapArg = parsedOptions.getLastArgument(.outputFileMap)?.asSingle {
       let path = try AbsolutePath(validating: outputFileMapArg)
-      self.outputFileMap = try .load(file: path, diagnosticEngine: diagnosticEngine)
+      outputFileMap = try .load(file: path, diagnosticEngine: diagnosticEngine)
+    } else {
+      outputFileMap = nil
     }
-    else {
-      self.outputFileMap = nil
+
+    if let workingDirectory = self.workingDirectory {
+      self.outputFileMap = outputFileMap?.resolveRelativePaths(relativeTo: workingDirectory)
+    } else {
+      self.outputFileMap = outputFileMap
     }
 
     // Determine the compilation mode.
@@ -441,7 +459,7 @@ extension Driver {
     var isEscaping = false
     // Indicates if we are currently parsing quoted text.
     var quoted = false
-    
+
     for char in line {
       // Backslash escapes to the next character.
       if char == #"\"#, !isEscaping {
@@ -480,7 +498,7 @@ extension Driver {
     return content.split { $0 == "\n" || $0 == "\r\n" }
            .flatMap { tokenizeResponseFileLine($0) }
   }
-  
+
   /// Recursively expands the response files.
   /// - Parameter visitedResponseFiles: Set containing visited response files to detect recursive parsing.
   private static func expandResponseFiles(
@@ -605,7 +623,7 @@ extension Driver {
       return
     }
 
-    if jobs.contains(where: { $0.requiresInPlaceExecution }) {
+    if jobs.contains(where: { $0.requiresInPlaceExecution }) || jobs.count == 1 {
       assert(jobs.count == 1, "Cannot execute in place for multi-job build plans")
       return try executeJobInPlace(jobs[0], resolver: resolver, forceResponseFiles: forceResponseFiles)
     }
@@ -619,7 +637,8 @@ extension Driver {
         executorDelegate: executorDelegate,
         numParallelJobs: numParallelJobs,
         processSet: processSet,
-        forceResponseFiles: forceResponseFiles
+        forceResponseFiles: forceResponseFiles,
+        recordedInputModificationDates: recordedInputModificationDates
     )
     try jobExecutor.execute(env: env)
   }
@@ -645,6 +664,8 @@ extension Driver {
       try ProcessEnv.setVar(envVar, value: value)
     }
 
+    try job.verifyInputsNotModified(since: self.recordedInputModificationDates)
+
     return try exec(path: arguments[0], args: arguments)
   }
 
@@ -1148,12 +1169,12 @@ extension Driver {
   private static func baseNameWithoutExtension(_ path: String, hasExtension: inout Bool) -> String {
     if let absolute = try? AbsolutePath(validating: path) {
       hasExtension = absolute.extension != nil
-      return absolute.basenameWithoutAllExts
+      return absolute.basenameWithoutExt
     }
 
     if let relative = try? RelativePath(validating: path) {
       hasExtension = relative.extension != nil
-      return relative.basenameWithoutAllExts
+      return relative.basenameWithoutExt
     }
 
     hasExtension = false
@@ -1251,7 +1272,7 @@ extension Driver {
       // This value will fail the isSwiftIdentifier test below.
       moduleName = ""
     }
-    
+
     func fallbackOrDiagnose(_ error: Diagnostic.Message) {
       // FIXME: Current driver notes that this is a "fallback module name".
       if compilerOutputType == nil || maybeBuildingExecutable(&parsedOptions, linkerOutputType: linkerOutputType) {
@@ -1330,7 +1351,7 @@ extension Driver {
         sdkPath = try? toolchain.defaultSDKPath()?.pathString
       }
     }
-    
+
     // An empty string explicitly clears the SDK.
     if sdkPath == "" {
       sdkPath = nil
@@ -1445,7 +1466,7 @@ extension Driver {
   #else
   static let defaultToolchainType: Toolchain.Type = GenericUnixToolchain.self
   #endif
-  
+
   static func computeToolchain(
     _ explicitTarget: Triple?,
     diagnosticsEngine: DiagnosticsEngine,

Sources/SwiftDriver/Driver/DriverKind.swift

@@ -70,7 +70,7 @@ extension DriverKind {
       return "Swift Module Wrapper"
     }
   }
-  
+
   public var seeAlsoHelpMessage: String? {
     switch self {
     case .interactive:

Sources/SwiftDriver/Driver/OutputFileMap.swift

@@ -47,6 +47,25 @@ public struct OutputFileMap: Equatable {
     try! existingOutput(inputFile: VirtualPath(path: ""), outputType: outputType)
   }
 
+  public func resolveRelativePaths(relativeTo absPath: AbsolutePath) -> OutputFileMap {
+    let resolvedKeyValues: [(VirtualPath, [FileType : VirtualPath])] = entries.map {
+      let resolvedKey: VirtualPath
+      // Special case for single dependency record, leave it as is
+      if ($0.key == .relative(.init(""))) {
+        resolvedKey = $0.key
+      } else {
+        resolvedKey = $0.key.resolvedRelativePath(base: absPath)
+      }
+      let resolvedValue = $0.value.mapValues {
+        $0.resolvedRelativePath(base: absPath)
+      }
+      return (resolvedKey, resolvedValue)
+    }
+    return OutputFileMap(entries: .init(resolvedKeyValues, uniquingKeysWith: { _,_ in
+      fatalError("Paths collided after resolving")
+    }))
+  }
+
   /// Load the output file map at the given path.
   public static func load(
     file: AbsolutePath,
@@ -156,9 +175,9 @@ fileprivate struct OutputFileMapJSON: Codable {
 
   /// Converts into virtual path entries.
   func toVirtualOutputFileMap() throws -> [VirtualPath : [FileType : VirtualPath]] {
-    Dictionary(uniqueKeysWithValues: try entries.map { input, entry in
+    Dictionary(try entries.map { input, entry in
       (try VirtualPath(path: input), try entry.paths.mapValues(VirtualPath.init(path:)))
-    })
+    }, uniquingKeysWith: { $1 })
   }
 
   /// Converts from virtual path entries
@@ -186,3 +205,10 @@ extension String {
     return self + "." + ext
   }
 }
+
+extension VirtualPath {
+  fileprivate func resolvedRelativePath(base: AbsolutePath) -> VirtualPath {
+    guard case let .relative(relPath) = self else { return self }
+    return .absolute(.init(base, relPath))
+  }
+}

Sources/SwiftDriver/Execution/JobExecutor.swift

@@ -119,7 +119,7 @@ public final class JobExecutor {
 
     /// The resolver for argument template.
     let argsResolver: ArgsResolver
-    
+
     /// The environment variables.
     let env: [String: String]
 
@@ -138,14 +138,18 @@ public final class JobExecutor {
     /// If true, always use response files to pass command line arguments.
     let forceResponseFiles: Bool
 
+    /// The last time each input file was modified, recorded at the start of the build.
+    public let recordedInputModificationDates: [TypedVirtualPath: Date]
+
     init(
       argsResolver: ArgsResolver,
       env: [String: String],
       producerMap: [VirtualPath: Job],
       executorDelegate: JobExecutorDelegate,
       jobQueue: OperationQueue,
       processSet: ProcessSet?,
-      forceResponseFiles: Bool
+      forceResponseFiles: Bool,
+      recordedInputModificationDates: [TypedVirtualPath: Date]
     ) {
       self.producerMap = producerMap
       self.argsResolver = argsResolver
@@ -154,6 +158,7 @@ public final class JobExecutor {
       self.jobQueue = jobQueue
       self.processSet = processSet
       self.forceResponseFiles = forceResponseFiles
+      self.recordedInputModificationDates = recordedInputModificationDates
     }
   }
 
@@ -175,20 +180,25 @@ public final class JobExecutor {
   /// If true, always use response files to pass command line arguments.
   let forceResponseFiles: Bool
 
+  /// The last time each input file was modified, recorded at the start of the build.
+  public let recordedInputModificationDates: [TypedVirtualPath: Date]
+
   public init(
     jobs: [Job],
     resolver: ArgsResolver,
     executorDelegate: JobExecutorDelegate,
     numParallelJobs: Int? = nil,
     processSet: ProcessSet? = nil,
-    forceResponseFiles: Bool = false
+    forceResponseFiles: Bool = false,
+    recordedInputModificationDates: [TypedVirtualPath: Date] = [:]
   ) {
     self.jobs = jobs
     self.argsResolver = resolver
     self.executorDelegate = executorDelegate
     self.numParallelJobs = numParallelJobs ?? 1
     self.processSet = processSet
     self.forceResponseFiles = forceResponseFiles
+    self.recordedInputModificationDates = recordedInputModificationDates
   }
 
   /// Execute all jobs.
@@ -227,7 +237,8 @@ public final class JobExecutor {
       executorDelegate: executorDelegate,
       jobQueue: jobQueue,
       processSet: processSet,
-      forceResponseFiles: forceResponseFiles
+      forceResponseFiles: forceResponseFiles,
+      recordedInputModificationDates: recordedInputModificationDates
     )
   }
 }
@@ -382,6 +393,8 @@ class ExecuteJobRule: LLBuildRule {
       let arguments: [String] = try resolver.resolveArgumentList(for: job,
                                                                  forceResponseFiles: context.forceResponseFiles)
 
+      try job.verifyInputsNotModified(since: context.recordedInputModificationDates)
+
       let process = try context.executorDelegate.launchProcess(
         for: job, arguments: arguments, env: env
       )

Sources/SwiftDriver/Jobs/CompileJob.swift

@@ -25,8 +25,57 @@ extension Driver {
     }
   }
 
-  /// Add the compiler inputs for a frontend compilation job, and return the corresponding primary set of outputs.
-  func addCompileInputs(primaryInputs: [TypedVirtualPath], inputs: inout [TypedVirtualPath], commandLine: inout [Job.ArgTemplate]) -> [TypedVirtualPath] {
+  fileprivate mutating func computePrimaryOutput(for input: TypedVirtualPath, outputType: FileType,
+                                        isTopLevel: Bool) -> TypedVirtualPath {
+    if let path = outputFileMap?.existingOutput(inputFile: input.file, outputType: outputType) {
+      return TypedVirtualPath(file: path, type: outputType)
+    }
+
+    if isTopLevel {
+      if let baseOutput = parsedOptions.getLastArgument(.o)?.asSingle,
+         let baseOutputPath = try? VirtualPath(path: baseOutput){
+        return TypedVirtualPath(file: baseOutputPath, type: outputType)
+      } else if compilerOutputType?.isTextual == true {
+        return TypedVirtualPath(file: .standardOutput, type: outputType)
+      }
+    }
+
+    let baseName: String
+    if (!compilerMode.usesPrimaryFileInputs && numThreads == 0) {
+      baseName = moduleName
+    } else {
+      baseName = input.file.basenameWithoutExt
+    }
+
+    if !isTopLevel {
+      return TypedVirtualPath(file:VirtualPath.temporary(.init(baseName.appendingFileTypeExtension(outputType))),
+                              type: outputType)
+    }
+
+    return TypedVirtualPath(file: .relative(.init(baseName.appendingFileTypeExtension(outputType))), type: outputType)
+  }
+
+  /// Add the compiler inputs for a frontend compilation job, and return the
+  /// corresponding primary set of outputs.
+  mutating func addCompileInputs(primaryInputs: [TypedVirtualPath],
+                                 inputs: inout [TypedVirtualPath],
+                                 commandLine: inout [Job.ArgTemplate]) -> [TypedVirtualPath] {
+    // Is this compile job top-level
+    let isTopLevel: Bool
+
+    switch compilerOutputType {
+    case .assembly, .sil, .raw_sil, .llvmIR, .ast:
+      isTopLevel = true
+    case .object:
+      isTopLevel = (linkerOutputType == nil)
+    case .swift, .sib, .image, .dSYM, .dependencies, .autolink,
+         .swiftModule, .swiftDocumentation, .swiftInterface,
+         .swiftSourceInfoFile, .raw_sib, .llvmBitcode, .diagnostics,
+         .objcHeader, .swiftDeps, .remap, .importedModules, .tbd, .moduleTrace,
+         .indexData, .optimizationRecord, .pcm, .pch, nil:
+      isTopLevel = false
+    }
+
     // Collect the set of input files that are part of the Swift compilation.
     let swiftInputFiles: [TypedVirtualPath] = inputFiles.compactMap { inputFile in
       if inputFile.type.isPartOfSwiftCompilation {
@@ -58,21 +107,19 @@ extension Driver {
       // add an output for the input.
       if isPrimary || numThreads > 0,
           let compilerOutputType = compilerOutputType {
-        let output = (outputFileMap ?? OutputFileMap()).getOutput(
-          inputFile: input.file,
-          outputType: compilerOutputType
-        )
-        primaryOutputs.append(TypedVirtualPath(file: output, type: compilerOutputType))
+        primaryOutputs.append(computePrimaryOutput(for: input,
+                                                   outputType: compilerOutputType,
+                                                   isTopLevel: isTopLevel))
       }
     }
 
     // When not using primary file inputs or multithreading, add a single output.
     if !usesPrimaryFileInputs && numThreads == 0,
         let outputType = compilerOutputType {
-      let existingOutputPath = outputFileMap?.existingOutputForSingleInput(
-          outputType: outputType)
-      let output = existingOutputPath ?? VirtualPath.temporary(.init(moduleName.appendingFileTypeExtension(outputType)))
-      primaryOutputs.append(TypedVirtualPath(file: output, type: outputType))
+      primaryOutputs.append(computePrimaryOutput(
+        for: TypedVirtualPath(file: try! VirtualPath(path: ""),
+                              type: swiftInputFiles[0].type),
+        outputType: outputType, isTopLevel: isTopLevel))
     }
 
     return primaryOutputs