averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add -enable-experimental-dependencies and push it through.

Browse Source
This commit is contained in:
David Ungar
2018-10-26 11:07:03 -07:00
parent 4710c43b01
commit 1f4dfce598
13 changed files with 80 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Driver/Compilation.cpp
View File

@@ -117,7 +117,8 @@ Compilation::Compilation(DiagnosticEngine &Diags,
Optional<unsigned> BatchSizeLimit,
bool SaveTemps,
bool ShowDriverTimeCompilation,
std::unique_ptr<UnifiedStatsReporter> StatsReporter)
std::unique_ptr<UnifiedStatsReporter> StatsReporter,
bool EnableExperimentalDependencies)
: Diags(Diags), TheToolChain(TC),
TheOutputInfo(OI),
Level(Level),
@@ -138,7 +139,9 @@ Compilation::Compilation(DiagnosticEngine &Diags,
SaveTemps(SaveTemps),
ShowDriverTimeCompilation(ShowDriverTimeCompilation),
Stats(std::move(StatsReporter)),
FilelistThreshold(FilelistThreshold) {
FilelistThreshold(FilelistThreshold),
EnableExperimentalDependencies(EnableExperimentalDependencies) {
};
static bool writeFilelistIfNecessary(const Job *job, const ArgList &args,
@@ -405,7 +408,9 @@ namespace driver {
if (ReturnCode == EXIT_SUCCESS || ReturnCode == EXIT_FAILURE) {
bool wasCascading = DepGraph.isMarked(FinishedCmd);
switch (DepGraph.loadFromPath(FinishedCmd, DependenciesFile)) {
switch (
DepGraph.loadFromPath(FinishedCmd, DependenciesFile,
Comp.getEnableExperimentalDependencies())) {
case DependencyGraphImpl::LoadResult::HadError:
if (ReturnCode == EXIT_SUCCESS) {
dependencyLoadFailed(DependenciesFile);
@@ -696,7 +701,9 @@ namespace driver {
if (Cmd->getCondition() == Job::Condition::NewlyAdded) {
DepGraph.addIndependentNode(Cmd);
} else {
switch (DepGraph.loadFromPath(Cmd, DependenciesFile)) {
switch (DepGraph.loadFromPath(
Cmd, DependenciesFile,
Comp.getEnableExperimentalDependencies())) {
case DependencyGraphImpl::LoadResult::HadError:
dependencyLoadFailed(DependenciesFile, /*Warn=*/false);
break;