Skip to content

[Incremental] Check against build start time, not build record mod time #766

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
Jul 16, 2021
Merged

[Incremental] Check against build start time, not build record mod time #766

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
4 changes: 2 additions & 2 deletions Sources/SwiftDriver/IncrementalCompilation/IncrementalDependencyAndInputSetup.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,11 @@ extension IncrementalCompilationState.IncrementalDependencyAndInputSetup {
graphIfPresent = nil
}
catch let ModuleDependencyGraph.ReadError.timeTravellingPriors(priorsModTime: priorsModTime,
buildRecordModTime: buildRecordModTime,
buildStartTime: buildStartTime,
priorsTimeIntervalSinceStart: priorsTimeIntervalSinceStart) {
diagnosticEngine.emit(
warning: "Will not do cross-module incremental builds, priors saved at \(priorsModTime)), " +
"but the previous build started at \(buildRecordModTime) [priorsTimeIntervalSinceStart: \(priorsTimeIntervalSinceStart)], at '\(dependencyGraphPath)'")
"but the previous build started at \(buildStartTime) [priorsTimeIntervalSinceStart: \(priorsTimeIntervalSinceStart)], at '\(dependencyGraphPath)'")
graphIfPresent = nil
}
catch {
Expand Down
13 changes: 6 additions & 7 deletions Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ extension ModuleDependencyGraph {
case unknownKind
case unknownDependencySourceExtension
case timeTravellingPriors(priorsModTime: Date,
buildRecordModTime: Date,
buildStartTime: Date,
priorsTimeIntervalSinceStart: TimeInterval)
}

Expand Down Expand Up @@ -811,17 +811,16 @@ extension ModuleDependencyGraph {
fileprivate static func ensurePriorsCreatedDuringPriorBuild(
at path: VirtualPath,
info: IncrementalCompilationState.IncrementalDependencyAndInputSetup) throws {
guard let priorsModTime = try? info.fileSystem.lastModificationTime(for: path),
let buildRecordModTime =
try? info.fileSystem.lastModificationTime(for: info.buildRecordInfo.buildRecordPath)
let buildStartTime = info.buildStartTime
guard let priorsModTime = try? info.fileSystem.lastModificationTime(for: path)
else {
return
}
let priorsTimeIntervalSinceStart = priorsModTime.timeIntervalSince(buildRecordModTime)
let priorsTimeIntervalSinceStart = priorsModTime.timeIntervalSince(buildStartTime)
// CI seems to emit identical times; I'm not sure why. So compare to -1.
guard -1.0 < priorsTimeIntervalSinceStart else {
guard -1.0 <= priorsTimeIntervalSinceStart else {
throw ReadError.timeTravellingPriors(priorsModTime: priorsModTime,
buildRecordModTime: buildRecordModTime,
buildStartTime: buildStartTime,
priorsTimeIntervalSinceStart: priorsTimeIntervalSinceStart)
}
}
Expand Down