From: David Majnemer Date: Mon, 27 Oct 2014 22:31:50 +0000 (+0000) Subject: Frontend: Don't include stdin in the dependency list for an object file X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0822fb00a10911a762d271008e41b47b3e0e2b9;p=platform%2Fupstream%2Fllvm.git Frontend: Don't include stdin in the dependency list for an object file GCC doesn't do this and it semes weird to include a file that we can't open. This fixes PR21362. llvm-svn: 220726 --- diff --git a/clang/lib/Frontend/DependencyFile.cpp b/clang/lib/Frontend/DependencyFile.cpp index 22ed38f..08d66c7 100644 --- a/clang/lib/Frontend/DependencyFile.cpp +++ b/clang/lib/Frontend/DependencyFile.cpp @@ -22,6 +22,7 @@ #include "clang/Lex/Preprocessor.h" #include "clang/Serialization/ASTReader.h" #include "llvm/ADT/StringSet.h" +#include "llvm/ADT/StringSwitch.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include "llvm/Support/raw_ostream.h" @@ -113,10 +114,18 @@ void DependencyCollector::maybeAddDependency(StringRef Filename, bool FromModule Dependencies.push_back(Filename); } +static bool isSpecialFilename(StringRef Filename) { + return llvm::StringSwitch(Filename) + .Case("", true) + .Case("", true) + .Default(false); +} + bool DependencyCollector::sawDependency(StringRef Filename, bool FromModule, bool IsSystem, bool IsModuleFile, bool IsMissing) { - return Filename != "" && (needSystemDependencies() || !IsSystem); + return !isSpecialFilename(Filename) && + (needSystemDependencies() || !IsSystem); } DependencyCollector::~DependencyCollector() { } @@ -218,7 +227,7 @@ void DependencyFileGenerator::AttachToASTReader(ASTReader &R) { /// considered as a dependency. bool DFGImpl::FileMatchesDepCriteria(const char *Filename, SrcMgr::CharacteristicKind FileType) { - if (strcmp("", Filename) == 0) + if (isSpecialFilename(Filename)) return false; if (IncludeSystemHeaders)