Skip to content

Incremental: ensure we add post-compile jobs if no new compile jobs are found #509

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
Feb 23, 2021
Merged

Incremental: ensure we add post-compile jobs if no new compile jobs are found #509

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
10 changes: 5 additions & 5 deletions Sources/SwiftDriver/IncrementalCompilation/IncrementalCompilationState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class IncrementalCompilationState {

/// Track required jobs that haven't finished so the build record can record the corresponding
/// input statuses.
private var unfinishedJobs: Set<Job>
private var unfinishedCompileJobs: Set<Job>

/// Keyed by primary input. As required compilations are discovered after the first wave, these shrink.
private var skippedCompileGroups = [TypedVirtualPath: CompileJobGroup]()
Expand Down Expand Up @@ -101,7 +101,7 @@ public class IncrementalCompilationState {

self.skippedCompileGroups = initial.skippedCompileGroups
self.mandatoryJobsInOrder = initial.mandatoryJobsInOrder
self.unfinishedJobs = Set(self.mandatoryJobsInOrder)
self.unfinishedCompileJobs = Set(self.mandatoryJobsInOrder.filter{$0.kind.isCompile})
self.jobsAfterCompiles = jobsInPhases.afterCompiles
self.moduleDependencyGraph = initial.graph
self.driver = driver
Expand Down Expand Up @@ -220,7 +220,7 @@ extension IncrementalCompilationState {
job finishedJob: Job, result: ProcessResult
) throws -> [Job]? {
return try confinementQueue.sync {
unfinishedJobs.remove(finishedJob)
unfinishedCompileJobs.remove(finishedJob)

guard case .terminated = result.exitStatus else {
return []
Expand All @@ -238,8 +238,8 @@ extension IncrementalCompilationState {
}
}
let newJobs = try getJobs(for: invalidatedInputs)
unfinishedJobs.formUnion(newJobs)
if unfinishedJobs.isEmpty {
unfinishedCompileJobs.formUnion(newJobs)
if unfinishedCompileJobs.isEmpty {
// no more compilations are possible
return nil
}
Expand Down