Skip to content

[Integrated driver] Adopt new driver APIs for descriptions. #2765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 23, 2020
Merged

[Integrated driver] Adopt new driver APIs for descriptions. #2765

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e8b2f8
[Integrated Swift driver] Pass along the Swift location.
DougGregor May 23, 2020
21c63dc
[Integrated driver] Adopt new driver APIs for descriptions.
DougGregor May 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 8 additions & 71 deletions Sources/Build/ManifestBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,87 +200,24 @@ extension LLBuildManifestBuilder {
do {
// Use the integrated Swift driver to compute the set of frontend
// jobs needed to build this Swift target.
var driver = try Driver(args: target.emitCommandLine(), fileSystem: target.fs)
var commandLine = target.emitCommandLine();
commandLine.append("-driver-use-frontend-path")
commandLine.append(buildParameters.toolchain.swiftCompiler.pathString)
var driver = try Driver(args: commandLine, fileSystem: target.fs)
let jobs = try driver.planBuild()
let resolver = try ArgsResolver(fileSystem: target.fs)

for job in jobs {
// Figure out which tool we are using.
// FIXME: This feels like a hack.
let datool: String
let isSwiftFrontend: Bool
switch job.kind {
case .compile, .mergeModule, .emitModule, .generatePCH,
.generatePCM, .interpret, .repl, .printTargetInfo,
.versionRequest, .backend:
datool = buildParameters.toolchain.swiftCompiler.pathString
isSwiftFrontend = true

case .autolinkExtract, .generateDSYM, .help, .link, .verifyDebugInfo:
datool = try resolver.resolve(.path(job.tool))
isSwiftFrontend = false
}

let tool = try resolver.resolve(.path(job.tool))
let commandLine = try job.commandLine.map{ try resolver.resolve($0) }
let arguments = [datool] + commandLine
let arguments = [tool] + commandLine

let jobInputs = job.inputs.map { $0.resolveToNode() }
let jobOutputs = job.outputs.map { $0.resolveToNode() }

// Compute a description for this particular job. The output
// is intended to match that of the built-in Swift compiler
// tool so that the use of the integrated driver is mostly
// an implementation detail.
let moduleName = target.target.c99name
let description: String
switch job.kind {
case .compile:
description = "Compiling \(moduleName) \(job.displayInputs.first?.file.name ?? "")"

case .mergeModule:
description = "Merging module \(moduleName)"

case .link:
description = "Linking \(moduleName)"

case .generateDSYM:
description = "Generating dSYM for module \(moduleName)"

case .autolinkExtract:
description = "Extracting autolink information for module \(moduleName)"

case .emitModule:
description = "Emitting module for \(moduleName)"

case .generatePCH:
description = "Compiling bridging header \(job.displayInputs.first!.file.name)"

case .generatePCM:
description = "Compiling Clang module \(job.displayInputs.first!.file.name)"

case .interpret:
description = "Interpreting \(job.displayInputs.first!.file.name)"

case .repl:
description = "Executing Swift REPL"

case .verifyDebugInfo:
description = "Verifying debug information for module \(moduleName)"

case .printTargetInfo:
description = "Gathering target information for module \(moduleName)"

case .versionRequest:
description = "Getting Swift version information"

case .help:
description = "Swift help"

case .backend:
description = "Embedding bitcode for \(moduleName)"
}

if isSwiftFrontend {
let description = job.description
if job.kind.isSwiftFrontend {
manifest.addSwiftFrontendCmd(
name: jobOutputs.first!.name,
moduleName: moduleName,
Expand Down