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

[Driver] Warn when using -incremental without a proper output file map.

Browse Source 
Just so people don't try to use it on the command line and then get
surprised.

Swift SVN r25508
This commit is contained in:
Jordan Rose
2015-02-24 20:02:26 +00:00
parent 3357ee21f3
commit cadd851e1b
4 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Driver/Driver.cpp
View File

@@ -947,18 +947,36 @@ void Driver::buildActions(const ToolChain &TC,
}
OutOfDateMap outOfDateMap;
bool rebuildEverything = false;
bool rebuildEverything = true;
static_assert(CompileJobAction::BuildState() ==
CompileJobAction::BuildState::UpToDate,
"relying on default-initialization");
// FIXME: This should work without an output file map. We should have another
// way to specify a build record.
if (OFM && IsIncremental) {
if (auto *masterOutputMap = OFM->getOutputMapForSingleOutput()) {
if (populateOutOfDateMap(outOfDateMap, ArgsHash, Inputs,
masterOutputMap->lookup(types::TY_SwiftDeps))) {
// FIXME: Distinguish errors from "file removed".
rebuildEverything = true;
if (IsIncremental) {
if (!OFM) {
// FIXME: This should work without an output file map. We should have
// another way to specify a build record and where to put intermediates.
Diags.diagnose(SourceLoc(), diag::incremental_requires_output_file_map);
} else {
StringRef buildRecordPath;
if (auto *masterOutputMap = OFM->getOutputMapForSingleOutput())
buildRecordPath = masterOutputMap->lookup(types::TY_SwiftDeps);
if (buildRecordPath.empty()) {
Diags.diagnose(SourceLoc(),
diag::incremental_requires_build_record_entry,
types::getTypeName(types::TY_SwiftDeps));
// FIXME: Some of our dependencies tests still don't have build records.
// Allow them to run "incrementally".
rebuildEverything = false;
} else {
if (populateOutOfDateMap(outOfDateMap, ArgsHash, Inputs,
buildRecordPath)) {
// FIXME: Distinguish errors from "file removed", which is benign.
} else {
rebuildEverything = false;
}
}
}
}