Skip to content

Support invoking the Fast Dependency Scanner: -scan-dependencies #97

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 1 commit into from
May 14, 2020
Merged

Support invoking the Fast Dependency Scanner: -scan-dependencies #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions Sources/SwiftDriver/Driver/Driver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,9 @@ extension Driver {
case .interpret:
compilerOutputType = nil

case .scanDependencies:
compilerOutputType = .jsonDependencies

default:
fatalError("unhandled output mode option \(outputOption)")
}
Expand Down
4 changes: 3 additions & 1 deletion Sources/SwiftDriver/Jobs/CompileJob.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ extension Driver {
let isTopLevel: Bool

switch compilerOutputType {
case .assembly, .sil, .raw_sil, .llvmIR, .ast:
case .assembly, .sil, .raw_sil, .llvmIR, .ast, .jsonDependencies:
isTopLevel = true
case .object:
isTopLevel = (linkerOutputType == nil)
Expand Down Expand Up @@ -242,6 +242,8 @@ extension FileType {
return .typecheck
case .remap:
return .updateCode
case .jsonDependencies:
return .scanDependencies

case .swift, .dSYM, .autolink, .dependencies, .swiftDocumentation, .pcm,
.diagnostics, .objcHeader, .image, .swiftDeps, .moduleTrace, .tbd,
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ extension Driver {
try commandLine.appendLast(.disableParserLookup, from: &parsedOptions)
try commandLine.appendLast(.sanitizeRecoverEQ, from: &parsedOptions)
try commandLine.appendLast(.enableFineGrainedDependencies, from: &parsedOptions)
try commandLine.appendLast(.scanDependencies, from: &parsedOptions)
try commandLine.appendLast(.fineGrainedDependencyIncludeIntrafile, from: &parsedOptions)
try commandLine.appendLast(.enableExperimentalConcisePoundFile, from: &parsedOptions)
try commandLine.appendLast(.printEducationalNotes, from: &parsedOptions)
Expand Down
15 changes: 12 additions & 3 deletions Sources/SwiftDriver/Utilities/FileType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ public enum FileType: String, Hashable, CaseIterable, Codable {
/// Text-based dylib (TBD) file.
case tbd

/// JSON-based Module Dependency Scanner output
case jsonDependencies = "dependencies.json"

/// Module trace file.
///
/// Module traces are used by Apple's internal build infrastructure. Apple
Expand Down Expand Up @@ -138,6 +141,9 @@ extension FileType: CustomStringConvertible {
case .swiftDeps:
return "swift-dependencies"

case .jsonDependencies:
return "json-dependencies"

case .importedModules:
return "imported-modules"

Expand Down Expand Up @@ -166,7 +172,8 @@ extension FileType {
case .object, .pch, .ast, .llvmIR, .llvmBitcode, .assembly, .swiftModule,
.importedModules, .indexData, .remap, .dSYM, .autolink, .dependencies,
.swiftDocumentation, .pcm, .diagnostics, .objcHeader, .image,
.swiftDeps, .moduleTrace, .tbd, .optimizationRecord, .swiftInterface, .swiftSourceInfoFile:
.swiftDeps, .moduleTrace, .tbd, .optimizationRecord, .swiftInterface,
.swiftSourceInfoFile, .jsonDependencies:
return false
}
}
Expand Down Expand Up @@ -233,6 +240,8 @@ extension FileType {
return "objc-header"
case .swiftDeps:
return "swift-dependencies"
case .jsonDependencies:
return "json-dependencies"
case .importedModules:
return "imported-modules"
case .moduleTrace:
Expand All @@ -252,7 +261,7 @@ extension FileType {
switch self {
case .swift, .sil, .dependencies, .assembly, .ast, .raw_sil, .llvmIR,
.objcHeader, .autolink, .importedModules, .tbd, .moduleTrace,
.optimizationRecord, .swiftInterface:
.optimizationRecord, .swiftInterface, .jsonDependencies:
return true
case .image, .object, .dSYM, .pch, .sib, .raw_sib, .swiftModule,
.swiftDocumentation, .swiftSourceInfoFile, .llvmBitcode, .diagnostics,
Expand All @@ -270,7 +279,7 @@ extension FileType {
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, .optimizationRecord, .pcm, .pch:
.tbd, .moduleTrace, .indexData, .optimizationRecord, .pcm, .pch, .jsonDependencies:
return false
}
}
Expand Down
24 changes: 24 additions & 0 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,6 +1613,30 @@ final class SwiftDriverTests: XCTestCase {
}
}

func testScanDependenciesOption() throws {
do {
var driver = try Driver(args: ["swiftc", "-scan-dependencies", "foo.swift"])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-scan-dependencies supports other kinds of outputs. Can you feed in arguments to ask it to produce a dependencies file (.d) and make sure that ends up on the resulting command line?

let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 1)
let job = plannedJobs[0]
XCTAssertTrue(job.commandLine.contains(.flag("-scan-dependencies")))
}

// Test .d output
do {
var driver = try Driver(args: ["swiftc", "-scan-dependencies",
"-emit-dependencies", "foo.swift"])
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 1)
let job = plannedJobs[0]
print("")
print(job.commandLine)
XCTAssertTrue(job.commandLine.contains(.flag("-scan-dependencies")))
XCTAssertTrue(job.commandLine.contains(.flag("-emit-dependencies-path")))
XCTAssertTrue(job.commandLine.contains(.path(.temporary(RelativePath("foo.d")))))
}
}

func testPCHGeneration() throws {
do {
var driver = try Driver(args: ["swiftc", "-typecheck", "-import-objc-header", "TestInputHeader.h", "foo.swift"])
Expand Down