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

Last round of small changes

Browse Source
This commit is contained in:
David Ungar
2017-12-11 17:19:06 -08:00
parent 08e0d11ce3
commit 724d1c36cd
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Frontend/CompilerInvocation.cpp
View File

@@ -179,7 +179,8 @@ private:
continue;
hadDuplicates = addFile(A->getValue()) || hadDuplicates;
}
return false; // Don't bail out for duplicates, too many tests depend on it.
return false; // FIXME: Don't bail out for duplicates, too many tests depend
// on it.
}
bool doesCommandLineIncludeFilelist() { return FilelistPathArg; }
@@ -203,14 +204,13 @@ private:
for (auto file : llvm::make_range(llvm::line_iterator(*FilelistBuffer),
llvm::line_iterator()))
hadDuplicates = addFile(file) || hadDuplicates;
return false; // Don't bail out for duplicates, too many tests depend on it.
return false; // FIXME: Don't bail out for duplicates, too many tests depend
// on it.
}
bool addFile(StringRef file) {
if (Files.count(file) == 0) {
Files.insert(file);
if (Files.insert(file))
return false;
}
Diags.diagnose(SourceLoc(), diag::error_duplicate_input_file, file);
return true;
}