Merge branch 'master' into windows-toolchain

stevapple · web-flow · commit 31d25568def0 · 2020-09-17T09:08:59.000+08:00
diff --git a/Sources/SwiftDriver/CMakeLists.txt b/Sources/SwiftDriver/CMakeLists.txt
@@ -57,6 +57,7 @@ add_library(SwiftDriver
   Jobs/Toolchain+InterpreterSupport.swift
   Jobs/Toolchain+LinkerSupport.swift
   Jobs/VerifyDebugInfoJob.swift
+  Jobs/VerifyModuleInterfaceJob.swift
   Jobs/WindowsToolchain+LinkerSupport.swift
 
   Toolchains/DarwinToolchain.swift
diff --git a/Sources/SwiftDriver/Driver/Driver.swift b/Sources/SwiftDriver/Driver/Driver.swift
@@ -258,8 +258,10 @@ public struct Driver {
   ///   at the beginning.
   /// - Parameter env: The environment variables to use. This is a hook for testing;
   ///   in production, you should use the default argument, which copies the current environment.
-  /// - Parameter diagnosticsHandler: A callback executed when a diagnostic is
-  ///   emitted. The default argument prints diagnostics to stderr.
+  /// - Parameter diagnosticsEngine: The diagnotic engine used by the driver to emit errors
+  ///   and warnings.
+  /// - Parameter fileSystem: The filesystem used by the driver to find resources/SDKs,
+  ///   expand response files, etc. By default this is the local filesystem.
   /// - Parameter executor: Used by the driver to execute jobs. The default argument
   ///   is present to streamline testing, it shouldn't be used in production.
   /// - Parameter externalModuleDependencies: A collection of external modules that the main module
@@ -340,6 +342,16 @@ public struct Driver {
       self.outputFileMap = outputFileMap
     }
 
+    // If requested, print the output file map
+    if parsedOptions.contains(.driverPrintOutputFileMap) {
+      if let outputFileMap = self.outputFileMap {
+        stderrStream <<< outputFileMap.description
+        stderrStream.flush()
+      } else {
+        diagnosticsEngine.emit(.error_no_output_file_map_specified)
+      }
+    }
+
     self.fileListThreshold = try Self.computeFileListThreshold(&self.parsedOptions, diagnosticsEngine: diagnosticsEngine)
     self.shouldUseInputFileList = inputFiles.count > fileListThreshold
     if shouldUseInputFileList {
@@ -510,7 +522,7 @@ extension Driver {
   /// Determines whether the given arguments constitute a normal invocation,
   /// or whether they invoke a subcommand.
   ///
-  /// Returns the invocation mode along with the arguments modified for that mode.
+  /// - Returns: the invocation mode along with the arguments modified for that mode.
   public static func invocationRunMode(
     forArgs args: [String]
   ) throws -> (mode: InvocationRunMode, args: [String]) {
@@ -665,7 +677,7 @@ extension Driver {
   }
 
   /// Expand response files in the input arguments and return a new argument list.
-  public static func expandResponseFiles(
+  @_spi(Testing) public static func expandResponseFiles(
     _ args: [String],
     fileSystem: FileSystem,
     diagnosticsEngine: DiagnosticsEngine
@@ -684,7 +696,7 @@ extension Diagnostic.Message {
 extension Driver {
   /// Determine the driver kind based on the command-line arguments, consuming the arguments
   /// conveying this information.
-  public static func determineDriverKind(
+  @_spi(Testing) public static func determineDriverKind(
     args: inout [String]
   ) throws -> DriverKind {
     // Get the basename of the driver executable.
@@ -771,7 +783,7 @@ extension Driver {
     }
   }
 
-  public mutating func createToolExecutionDelegate() -> ToolExecutionDelegate {
+  mutating func createToolExecutionDelegate() -> ToolExecutionDelegate {
     var mode: ToolExecutionDelegate.Mode = .regular
 
     // FIXME: Old driver does _something_ if both are passed. Not sure if we want to support that.
@@ -817,6 +829,10 @@ extension Diagnostic.Message {
   static var warning_cannot_multithread_batch_mode: Diagnostic.Message {
     .warning("ignoring -num-threads argument; cannot multithread batch mode")
   }
+
+  static var error_no_output_file_map_specified: Diagnostic.Message {
+    .error("no output file map specified")
+  }
 }
 
 extension Driver {
diff --git a/Sources/SwiftDriver/Driver/OutputFileMap.swift b/Sources/SwiftDriver/Driver/OutputFileMap.swift
@@ -106,6 +106,23 @@ public struct OutputFileMap: Hashable, Codable {
     let contents = try encoder.encode(OutputFileMapJSON.fromVirtualOutputFileMap(entries).entries)
     try fileSystem.writeFileContents(file, bytes: ByteString(contents))
   }
+
+  /// Human-readable texual representation
+  var description: String {
+    var result = ""
+    func outputPairDescription(inputPath: VirtualPath, outputPair: (FileType, VirtualPath))
+    -> String {
+      "\(inputPath.description) -> \(outputPair.0.description): \"\(outputPair.1.description)\"\n"
+    }
+    let maps = entries.map { ($0, $1) }.sorted { $0.0.description < $1.0.description }
+    for (input, map) in maps {
+      let pairs = map.map { ($0, $1) }.sorted { $0.0.description < $1.0.description }
+      for (outputType, outputPath) in pairs {
+        result += outputPairDescription(inputPath: input, outputPair: (outputType, outputPath))
+      }
+    }
+    return result
+  }
 }
 
 /// Struct for loading the JSON file from disk.
diff --git a/Sources/SwiftDriver/Jobs/CompileJob.swift b/Sources/SwiftDriver/Jobs/CompileJob.swift
@@ -59,17 +59,18 @@ extension Driver {
   /// Is this compile job top-level
   func isTopLevelOutput(type: FileType?) -> Bool {
     switch type {
-    case .assembly, .sil, .raw_sil, .llvmIR, .ast, .jsonDependencies:
+    case .assembly, .sil, .raw_sil, .llvmIR, .ast, .jsonDependencies, .sib, .raw_sib,
+         .importedModules, .indexData:
       return true
     case .object:
       return (linkerOutputType == nil)
     case .swiftModule:
       return compilerMode.isSingleCompilation && moduleOutputInfo.output?.isTopLevel ?? false
-    case .swift, .sib, .image, .dSYM, .dependencies, .autolink,
-         .swiftDocumentation, .swiftInterface,
-         .swiftSourceInfoFile, .raw_sib, .llvmBitcode, .diagnostics,
-         .objcHeader, .swiftDeps, .remap, .importedModules, .tbd, .moduleTrace,
-         .indexData, .yamlOptimizationRecord, .bitstreamOptimizationRecord, .pcm,
+    case .llvmBitcode:
+      return compilerOutputType == type
+    case .swift, .image, .dSYM, .dependencies, .autolink, .swiftDocumentation, .swiftInterface,
+         .privateSwiftInterface, .swiftSourceInfoFile, .diagnostics, .objcHeader, .swiftDeps,
+         .remap, .tbd, .moduleTrace, .yamlOptimizationRecord, .bitstreamOptimizationRecord, .pcm,
          .pch, .clangModuleMap, .jsonTargetInfo, .jsonSwiftArtifacts, .jsonClangDependencies, nil:
       return false
     }
@@ -310,7 +311,7 @@ extension FileType {
     case .swift, .dSYM, .autolink, .dependencies, .swiftDocumentation, .pcm,
          .diagnostics, .objcHeader, .image, .swiftDeps, .moduleTrace, .tbd,
          .yamlOptimizationRecord, .bitstreamOptimizationRecord, .swiftInterface,
-         .swiftSourceInfoFile, .clangModuleMap, .jsonSwiftArtifacts:
+         .privateSwiftInterface, .swiftSourceInfoFile, .clangModuleMap, .jsonSwiftArtifacts:
       fatalError("Output type can never be a primary output")
     }
   }
diff --git a/Sources/SwiftDriver/Jobs/DarwinToolchain+LinkerSupport.swift b/Sources/SwiftDriver/Jobs/DarwinToolchain+LinkerSupport.swift
@@ -303,6 +303,11 @@ extension DarwinToolchain {
       commandLine.appendFlag("-application_extension")
     }
 
+    // On Darwin, we only support libc++.
+    if parsedOptions.contains(.enableExperimentalCxxInterop) {
+      commandLine.appendFlag("-lc++")
+    }
+
     // inputs LinkFileList
     if shouldUseInputFileList {
       commandLine.appendFlag(.filelist)
diff --git a/Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift b/Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift
@@ -91,6 +91,15 @@ extension Driver {
       commandLine.appendFlag(.disableObjcInterop)
     }
 
+    // Add flags for C++ interop
+    if parsedOptions.hasArgument(.enableExperimentalCxxInterop) {
+      commandLine.appendFlag(.enableCxxInterop)
+    }
+    if let stdlibVariant = parsedOptions.getLastArgument(.experimentalCxxStdlib)?.asSingle {
+      commandLine.appendFlag("-Xcc")
+      commandLine.appendFlag("-stdlib=\(stdlibVariant)")
+    }
+
     // Handle the CPU and its preferences.
     try commandLine.appendLast(.targetCpu, from: &parsedOptions)
 
diff --git a/Sources/SwiftDriver/Jobs/Job.swift b/Sources/SwiftDriver/Jobs/Job.swift
@@ -34,6 +34,7 @@ public struct Job: Codable, Equatable, Hashable {
     case versionRequest = "version-request"
     case scanDependencies = "scan-dependencies"
     case scanClangDependencies = "scan-clang-dependencies"
+    case verifyModuleInterface = "verify-emitted-module-interface"
     case help
   }
 
@@ -185,6 +186,9 @@ extension Job : CustomStringConvertible {
 
     case .scanClangDependencies:
       return "Scanning dependencies for Clang module \(moduleName)"
+
+    case .verifyModuleInterface:
+      return "Verifying emitted module interface for module \(moduleName)"
     }
   }
 }
@@ -195,7 +199,7 @@ extension Job.Kind {
     switch self {
     case .backend, .compile, .mergeModule, .emitModule, .generatePCH,
         .generatePCM, .interpret, .repl, .printTargetInfo,
-        .versionRequest, .scanDependencies, .scanClangDependencies:
+        .versionRequest, .scanDependencies, .scanClangDependencies, .verifyModuleInterface:
         return true
 
     case .autolinkExtract, .generateDSYM, .help, .link, .verifyDebugInfo, .moduleWrap:
@@ -212,7 +216,7 @@ extension Job.Kind {
          .generatePCM, .interpret, .repl, .printTargetInfo,
          .versionRequest, .autolinkExtract, .generateDSYM,
          .help, .link, .verifyDebugInfo, .scanDependencies,
-         .moduleWrap, .scanClangDependencies:
+         .moduleWrap, .scanClangDependencies, .verifyModuleInterface:
       return false
     }
   }
diff --git a/Sources/SwiftDriver/Jobs/Planning.swift b/Sources/SwiftDriver/Jobs/Planning.swift
@@ -196,6 +196,28 @@ extension Driver {
       mergeJob = mergeModule
     }
 
+    if let mergeJob = mergeJob,
+       parsedOptions.hasArgument(.enableLibraryEvolution),
+       parsedOptions.hasFlag(positive: .verifyEmittedModuleInterface,
+                             negative: .noVerifyEmittedModuleInterface,
+                             default: false) {
+      if parsedOptions.hasArgument(.emitModuleInterface) ||
+          parsedOptions.hasArgument(.emitModuleInterfacePath) {
+        let mergeInterfaceOutputs = mergeJob.outputs.filter { $0.type == .swiftInterface }
+        assert(mergeInterfaceOutputs.count == 1,
+               "Merge module job should only have one swiftinterface output")
+        let verifyJob = try verifyModuleInterfaceJob(interfaceInput: mergeInterfaceOutputs[0])
+        jobs.append(verifyJob)
+      }
+      if parsedOptions.hasArgument(.emitPrivateModuleInterfacePath) {
+        let mergeInterfaceOutputs = mergeJob.outputs.filter { $0.type == .privateSwiftInterface }
+        assert(mergeInterfaceOutputs.count == 1,
+               "Merge module job should only have one private swiftinterface output")
+        let verifyJob = try verifyModuleInterfaceJob(interfaceInput: mergeInterfaceOutputs[0])
+        jobs.append(verifyJob)
+      }
+    }
+
     // If we need to autolink-extract, do so.
     let autolinkInputs = linkerInputs.filter { $0.type == .object }
     if let autolinkExtractJob = try autolinkExtractJob(inputs: autolinkInputs) {
diff --git a/Sources/SwiftDriver/Jobs/VerifyModuleInterfaceJob.swift b/Sources/SwiftDriver/Jobs/VerifyModuleInterfaceJob.swift
@@ -0,0 +1,40 @@
+//===- VerifyModuleInterface.swift - Swift Module Interface Verification --===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+extension Driver {
+  mutating func verifyModuleInterfaceJob(interfaceInput: TypedVirtualPath) throws -> Job {
+    var commandLine: [Job.ArgTemplate] = swiftCompilerPrefixArgs.map { Job.ArgTemplate.flag($0) }
+    var inputs: [TypedVirtualPath] = []
+    commandLine.appendFlags("-frontend", "-typecheck-module-from-interface")
+    try addCommonFrontendOptions(commandLine: &commandLine, inputs: &inputs)
+    // FIXME: MSVC runtime flags
+
+    // Compute the serialized diagnostics output file
+    let outputFile: TypedVirtualPath
+    if let output = serializedDiagnosticsFilePath {
+      outputFile = TypedVirtualPath(file: output, type: .diagnostics)
+    } else {
+      outputFile = TypedVirtualPath(file: interfaceInput.file.replacingExtension(with: .diagnostics),
+                                    type: .diagnostics)
+    }
+
+    return Job(
+      moduleName: moduleOutputInfo.name,
+      kind: .verifyModuleInterface,
+      tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
+      commandLine: commandLine,
+      displayInputs: [],
+      inputs: [interfaceInput],
+      outputs: [outputFile]
+    )
+  }
+}
diff --git a/Sources/SwiftDriver/Utilities/FileType.swift b/Sources/SwiftDriver/Utilities/FileType.swift
@@ -51,6 +51,9 @@ public enum FileType: String, Hashable, CaseIterable, Codable {
   /// A textual Swift interface file.
   case swiftInterface = "swiftinterface"
 
+  /// An SPI Swift Interface file.
+  case privateSwiftInterface = "private.swiftinterface"
+
   /// Serialized source information.
   case swiftSourceInfoFile = "swiftsourceinfo"
 
@@ -132,10 +135,12 @@ public enum FileType: String, Hashable, CaseIterable, Codable {
 extension FileType: CustomStringConvertible {
   public var description: String {
     switch self {
-    case .swift, .sil, .sib, .image, .object, .dSYM, .dependencies, .autolink,
+    case .swift, .sil, .sib, .image, .dSYM, .dependencies, .autolink,
          .swiftModule, .swiftDocumentation, .swiftInterface, .swiftSourceInfoFile, .assembly,
          .remap, .tbd, .pcm, .pch, .clangModuleMap:
       return rawValue
+    case .object:
+      return "object"
 
     case .ast:
       return "ast-dump"
@@ -152,6 +157,9 @@ extension FileType: CustomStringConvertible {
     case .llvmBitcode:
       return "llvm-bc"
 
+    case .privateSwiftInterface:
+      return "private-swiftinterface"
+
     case .objcHeader:
       return "objc-header"
 
@@ -201,9 +209,9 @@ extension FileType {
     case .object, .pch, .ast, .llvmIR, .llvmBitcode, .assembly, .swiftModule,
          .importedModules, .indexData, .remap, .dSYM, .autolink, .dependencies,
          .swiftDocumentation, .pcm, .diagnostics, .objcHeader, .image,
-         .swiftDeps, .moduleTrace, .tbd, .yamlOptimizationRecord, .bitstreamOptimizationRecord, .swiftInterface,
-         .swiftSourceInfoFile, .jsonDependencies, .clangModuleMap, .jsonTargetInfo,
-         .jsonSwiftArtifacts, .jsonClangDependencies:
+         .swiftDeps, .moduleTrace, .tbd, .yamlOptimizationRecord, .bitstreamOptimizationRecord,
+         .swiftInterface, .privateSwiftInterface, .swiftSourceInfoFile, .jsonDependencies,
+         .clangModuleMap, .jsonTargetInfo, .jsonSwiftArtifacts, .jsonClangDependencies:
       return false
     }
   }
@@ -244,6 +252,8 @@ extension FileType {
       return "swiftdoc"
     case .swiftInterface:
       return "swiftinterface"
+    case .privateSwiftInterface:
+      return "private-swiftinterface"
     case .swiftSourceInfoFile:
       return "swiftsourceinfo"
     case .clangModuleMap:
@@ -301,8 +311,9 @@ extension FileType {
     switch self {
     case .swift, .sil, .dependencies, .assembly, .ast, .raw_sil, .llvmIR,
          .objcHeader, .autolink, .importedModules, .tbd, .moduleTrace,
-         .yamlOptimizationRecord, .swiftInterface, .jsonDependencies, .clangModuleMap,
-         .jsonTargetInfo, .jsonSwiftArtifacts, .jsonClangDependencies:
+         .yamlOptimizationRecord, .swiftInterface, .privateSwiftInterface,
+         .jsonDependencies, .clangModuleMap, .jsonTargetInfo, .jsonSwiftArtifacts,
+         .jsonClangDependencies:
       return true
     case .image, .object, .dSYM, .pch, .sib, .raw_sib, .swiftModule,
          .swiftDocumentation, .swiftSourceInfoFile, .llvmBitcode, .diagnostics,
@@ -318,11 +329,11 @@ extension FileType {
     case .assembly, .llvmIR, .llvmBitcode, .object:
       return true
     case .swift, .sil, .sib, .ast, .image, .dSYM, .dependencies, .autolink,
-         .swiftModule, .swiftDocumentation, .swiftInterface, .swiftSourceInfoFile,
-         .raw_sil, .raw_sib, .diagnostics, .objcHeader, .swiftDeps, .remap, .importedModules,
-         .tbd, .moduleTrace, .indexData, .yamlOptimizationRecord, .bitstreamOptimizationRecord,
-         .pcm, .pch, .jsonDependencies, .clangModuleMap, .jsonTargetInfo, .jsonSwiftArtifacts,
-         .jsonClangDependencies:
+         .swiftModule, .swiftDocumentation, .swiftInterface, .privateSwiftInterface,
+         .swiftSourceInfoFile, .raw_sil, .raw_sib, .diagnostics, .objcHeader, .swiftDeps, .remap,
+         .importedModules, .tbd, .moduleTrace, .indexData, .yamlOptimizationRecord,
+         .bitstreamOptimizationRecord, .pcm, .pch, .jsonDependencies, .clangModuleMap,
+         .jsonTargetInfo, .jsonSwiftArtifacts, .jsonClangDependencies:
       return false
     }
   }
diff --git a/Sources/SwiftDriver/Utilities/Triple+Platforms.swift b/Sources/SwiftDriver/Utilities/Triple+Platforms.swift
diff --git a/Sources/SwiftOptions/Options.swift b/Sources/SwiftOptions/Options.swift
diff --git a/Tests/SwiftDriverTests/IntegrationTests.swift b/Tests/SwiftDriverTests/IntegrationTests.swift
diff --git a/Tests/SwiftDriverTests/SwiftDriverTests.swift b/Tests/SwiftDriverTests/SwiftDriverTests.swift
diff --git a/Tests/SwiftDriverTests/TripleTests.swift b/Tests/SwiftDriverTests/TripleTests.swift

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public struct Job: Codable, Equatable, Hashable {`
`34`	`34`	`case versionRequest = "version-request"`
`35`	`35`	`case scanDependencies = "scan-dependencies"`
`36`	`36`	`case scanClangDependencies = "scan-clang-dependencies"`
	`37`	`+ case verifyModuleInterface = "verify-emitted-module-interface"`
`37`	`38`	`case help`
`38`	`39`	`}`
`39`	`40`
`@@ -185,6 +186,9 @@ extension Job : CustomStringConvertible {`
`185`	`186`
`186`	`187`	`case .scanClangDependencies:`
`187`	`188`	`return "Scanning dependencies for Clang module \(moduleName)"`
	`189`	`+`
	`190`	`+ case .verifyModuleInterface:`
	`191`	`+ return "Verifying emitted module interface for module \(moduleName)"`
`188`	`192`	`}`
`189`	`193`	`}`
`190`	`194`	`}`
`@@ -195,7 +199,7 @@ extension Job.Kind {`
`195`	`199`	`switch self {`
`196`	`200`	`case .backend, .compile, .mergeModule, .emitModule, .generatePCH,`
`197`	`201`	`.generatePCM, .interpret, .repl, .printTargetInfo,`
`198`		`- .versionRequest, .scanDependencies, .scanClangDependencies:`
	`202`	`+ .versionRequest, .scanDependencies, .scanClangDependencies, .verifyModuleInterface:`
`199`	`203`	`return true`
`200`	`204`
`201`	`205`	`case .autolinkExtract, .generateDSYM, .help, .link, .verifyDebugInfo, .moduleWrap:`
`@@ -212,7 +216,7 @@ extension Job.Kind {`
`212`	`216`	`.generatePCM, .interpret, .repl, .printTargetInfo,`
`213`	`217`	`.versionRequest, .autolinkExtract, .generateDSYM,`
`214`	`218`	`.help, .link, .verifyDebugInfo, .scanDependencies,`
`215`		`- .moduleWrap, .scanClangDependencies:`
	`219`	`+ .moduleWrap, .scanClangDependencies, .verifyModuleInterface:`
`216`	`220`	`return false`
`217`	`221`	`}`
`218`	`222`	`}`