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

Use the initial value of EnableFineGrainedDependencies as the default.

Browse Source
This commit is contained in:
David Ungar
2020-01-23 10:12:33 -08:00
parent f696aabffb
commit 98b86c63d1
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/swift/Basic/LangOptions.h
View File

@@ -298,6 +298,7 @@ namespace swift {
/// Emit the newer, finer-grained swiftdeps file. Eventually will support /// Emit the newer, finer-grained swiftdeps file. Eventually will support
/// faster rebuilds. /// faster rebuilds.
/// The initializer here sets the default for the frontend and driver.
bool EnableFineGrainedDependencies = false; bool EnableFineGrainedDependencies = false;
/// When using fine-grained dependencies, emit dot files for every swiftdeps /// When using fine-grained dependencies, emit dot files for every swiftdeps

4
include/swift/Driver/Compilation.h
View File

@@ -19,6 +19,7 @@
#include "swift/Basic/ArrayRefView.h" #include "swift/Basic/ArrayRefView.h"
#include "swift/Basic/LLVM.h" #include "swift/Basic/LLVM.h"
#include "swift/Basic/LangOptions.h"
#include "swift/Basic/NullablePtr.h" #include "swift/Basic/NullablePtr.h"
#include "swift/Basic/OutputFileMap.h" #include "swift/Basic/OutputFileMap.h"
#include "swift/Basic/Statistic.h" #include "swift/Basic/Statistic.h"
@@ -327,7 +328,8 @@ public:
bool ShowDriverTimeCompilation = false, bool ShowDriverTimeCompilation = false,
std::unique_ptr<UnifiedStatsReporter> Stats = nullptr, std::unique_ptr<UnifiedStatsReporter> Stats = nullptr,
bool OnlyOneDependencyFile = false, bool OnlyOneDependencyFile = false,
bool EnableFineGrainedDependencies = false, bool EnableFineGrainedDependencies =
LangOptions().EnableFineGrainedDependencies,
bool VerifyFineGrainedDependencyGraphAfterEveryImport = false, bool VerifyFineGrainedDependencyGraphAfterEveryImport = false,
bool EmitFineGrainedDependencyDotFileAfterEveryImport = false, bool EmitFineGrainedDependencyDotFileAfterEveryImport = false,
bool FineGrainedDependenciesIncludeIntrafileOnes = false, bool FineGrainedDependenciesIncludeIntrafileOnes = false,

5
lib/Driver/Driver.cpp
View File

@@ -21,6 +21,7 @@
#include "swift/AST/DiagnosticsDriver.h" #include "swift/AST/DiagnosticsDriver.h"
#include "swift/AST/DiagnosticsFrontend.h" #include "swift/AST/DiagnosticsFrontend.h"
#include "swift/Basic/LLVM.h" #include "swift/Basic/LLVM.h"
#include "swift/Basic/LangOptions.h"
#include "swift/Basic/OutputFileMap.h" #include "swift/Basic/OutputFileMap.h"
#include "swift/Basic/Platform.h" #include "swift/Basic/Platform.h"
#include "swift/Basic/Range.h" #include "swift/Basic/Range.h"
@@ -964,9 +965,11 @@ Driver::buildCompilation(const ToolChain &TC,
options::OPT_disable_only_one_dependency_file, true); options::OPT_disable_only_one_dependency_file, true);
// relies on the new dependency graph // relies on the new dependency graph
// Get the default from the initializer in LangOptions.
const bool EnableFineGrainedDependencies = const bool EnableFineGrainedDependencies =
ArgList->hasFlag(options::OPT_enable_fine_grained_dependencies, ArgList->hasFlag(options::OPT_enable_fine_grained_dependencies,
options::OPT_disable_fine_grained_dependencies, false); options::OPT_disable_fine_grained_dependencies,
LangOptions().EnableFineGrainedDependencies);
const bool VerifyFineGrainedDependencyGraphAfterEveryImport = ArgList->hasArg( const bool VerifyFineGrainedDependencyGraphAfterEveryImport = ArgList->hasArg(
options:: options::

3
lib/Frontend/CompilerInvocation.cpp
View File

@@ -428,7 +428,8 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
Opts.EnableFineGrainedDependencies = Opts.EnableFineGrainedDependencies =
Args.hasFlag(options::OPT_enable_fine_grained_dependencies, Args.hasFlag(options::OPT_enable_fine_grained_dependencies,
options::OPT_disable_fine_grained_dependencies, false); options::OPT_disable_fine_grained_dependencies,
Opts.EnableFineGrainedDependencies);
if (Args.hasArg(OPT_emit_fine_grained_dependency_sourcefile_dot_files)) if (Args.hasArg(OPT_emit_fine_grained_dependency_sourcefile_dot_files))
Opts.EmitFineGrainedDependencySourcefileDotFiles = true; Opts.EmitFineGrainedDependencySourcefileDotFiles = true;