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

[Frontend] Internalize createDependencyTracker

Browse Source 
Expand the FrontendOptions to allow the enabling
of the dependency tracker for non-system
dependencies, and switch the previous clients of
`createDependencyTracker` over to using this
option. This ensures that the dependency tracker
is now set only during `CompilerInstance::setup`.
This commit is contained in:
Hamish Knight
2020-06-29 15:26:26 -07:00
parent bddcda6333
commit 7bc5440d17
13 changed files with 80 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Frontend/Frontend.cpp
View File

@@ -289,17 +289,28 @@ void CompilerInstance::setupDiagnosticVerifierIfNeeded() {
}
void CompilerInstance::setupDependencyTrackerIfNeeded() {
assert(!Context && "Must be called before the ASTContext is created");
const auto &Invocation = getInvocation();
const auto &opts = Invocation.getFrontendOptions();
if (opts.InputsAndOutputs.hasDependencyTrackerPath() ||
!opts.IndexStorePath.empty() || opts.TrackSystemDeps) {
// Note that we're tracking dependencies even when we don't need to write
// them directly; in particular, -track-system-dependencies affects how
// module interfaces get loaded, and so we need to be consistently tracking
// system dependencies throughout the compiler.
createDependencyTracker(opts.TrackSystemDeps);
// Note that we may track dependencies even when we don't need to write them
// directly; in particular, -track-system-dependencies affects how module
// interfaces get loaded, and so we need to be consistently tracking system
// dependencies throughout the compiler.
auto collectionMode = opts.IntermoduleDependencyTracking;
if (!collectionMode) {
// If we have an output path specified, but no other tracking options,
// default to non-system dependency tracking.
if (opts.InputsAndOutputs.hasDependencyTrackerPath() ||
!opts.IndexStorePath.empty()) {
collectionMode = IntermoduleDepTrackingMode::ExcludeSystem;
}
}
if (!collectionMode)
return;
DepTracker = std::make_unique<DependencyTracker>(*collectionMode);
}
bool CompilerInstance::setup(const CompilerInvocation &Invok) {
@@ -701,8 +712,8 @@ bool CompilerInvocation::shouldImportSwiftONoneSupport() const {
// This optimization is disabled by -track-system-dependencies to preserve
// the explicit dependency.
const auto &options = getFrontendOptions();
return options.TrackSystemDeps
|| FrontendOptions::doesActionGenerateSIL(options.RequestedAction);
return options.shouldTrackSystemDependencies() ||
FrontendOptions::doesActionGenerateSIL(options.RequestedAction);
}
ImplicitImportInfo CompilerInstance::getImplicitImportInfo() const {