Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift_jenkins
2020-01-09 22:58:30 -08:00
25 changed files with 354 additions and 1761 deletions

View File

@@ -979,9 +979,7 @@ static void emitReferenceDependenciesForAllPrimaryInputsIfNeeded(
if (Invocation.getLangOptions().EnableFineGrainedDependencies)
(void)fine_grained_dependencies::emitReferenceDependencies(
Instance.getASTContext().Diags, SF,
*Instance.getDependencyTracker(), referenceDependenciesFilePath,
Invocation.getLangOptions()
.EmitFineGrainedDependencySourcefileDotFiles);
*Instance.getDependencyTracker(), referenceDependenciesFilePath);
else
(void)emitReferenceDependencies(Instance.getASTContext().Diags, SF,
*Instance.getDependencyTracker(),