Skip to content

[Incremental] Fix bug when vendor is external-incremental and client is not #460

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 3, 2021
Merged

[Incremental] Fix bug when vendor is external-incremental and client is not #460

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
7 changes: 4 additions & 3 deletions Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/Integrator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,9 @@ extension ModuleDependencyGraph.Integrator {
.contains(externalDependency)
guard !isKnown else {return}
if !isIncremental {
destination.reporter?.report("found externalDependency",
externalDependency.file)
// Nice for debugging, but too much otherwise:
// destination.reporter?.report("found externalDependency", externalDependency.file)

// no integration to do for these, so just remember them here
destination.externalDependencies.insert(externalDependency)
}
Expand All @@ -233,7 +234,7 @@ extension ModuleDependencyGraph.Integrator {
aspect: .interface,
designator: .externalDepend(externalDependency))
let isNewUse = destination.nodeFinder.record(def: key, use: moduleUseNode)
if !isNewUse {
if isNewUse {
destination.externalDependencies.insert(externalDependency)
results.changedNodes.insert(moduleUseNode)
}
Expand Down
10 changes: 0 additions & 10 deletions Tests/SwiftDriverTests/IncrementalCompilationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,6 @@ final class IncrementalCompilationTests: XCTestCase {
checkDiagnostics: checkDiagnostics,
expectingRemarks: [
"Disabling incremental cross-module building",
"Incremental compilation: found externalDependency",
"Incremental compilation: found externalDependency",
"Incremental compilation: May skip current input: {compile: main.o <= main.swift}",
"Incremental compilation: May skip current input: {compile: other.o <= other.swift}",
"Incremental compilation: Skipping input: {compile: main.o <= main.swift}",
Expand All @@ -472,8 +470,6 @@ final class IncrementalCompilationTests: XCTestCase {
checkDiagnostics: checkDiagnostics,
expectingRemarks: [
"Disabling incremental cross-module building",
"Incremental compilation: found externalDependency",
"Incremental compilation: found externalDependency",
"Incremental compilation: May skip current input: {compile: main.o <= main.swift}",
"Incremental compilation: Scheduing changed input {compile: other.o <= other.swift}",
"Incremental compilation: Queuing (initial): {compile: other.o <= other.swift}",
Expand All @@ -499,8 +495,6 @@ final class IncrementalCompilationTests: XCTestCase {
checkDiagnostics: checkDiagnostics,
expectingRemarks: [
"Disabling incremental cross-module building",
"Incremental compilation: found externalDependency",
"Incremental compilation: found externalDependency",
"Incremental compilation: Scheduing changed input {compile: main.o <= main.swift}",
"Incremental compilation: Scheduing changed input {compile: other.o <= other.swift}",
"Incremental compilation: Queuing (initial): {compile: main.o <= main.swift}",
Expand All @@ -527,8 +521,6 @@ final class IncrementalCompilationTests: XCTestCase {
checkDiagnostics: checkDiagnostics,
expectingRemarks: [
"Disabling incremental cross-module building",
"Incremental compilation: found externalDependency",
"Incremental compilation: found externalDependency",
"Incremental compilation: Scheduing changed input {compile: main.o <= main.swift}",
"Incremental compilation: May skip current input: {compile: other.o <= other.swift}",
"Incremental compilation: Queuing (initial): {compile: main.o <= main.swift}",
Expand Down Expand Up @@ -564,8 +556,6 @@ final class IncrementalCompilationTests: XCTestCase {
extraArguments: [extraArgument],
expectingRemarks: [
"Disabling incremental cross-module building",
"Incremental compilation: found externalDependency",
"Incremental compilation: found externalDependency",
"Incremental compilation: May skip current input: {compile: other.o <= other.swift}",
"Incremental compilation: Queuing (initial): {compile: main.o <= main.swift}",
"Incremental compilation: scheduling dependents of main.swift; -driver-always-rebuild-dependents",
Expand Down