summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/DependencyFile.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2017-06-29 02:19:42 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2017-06-29 02:19:42 +0000
commitf3f846162a5d6b5b84ed7d146a29dc175542c2c0 (patch)
tree77f0444b71827ec27ffb22111c45685d1bc4ea6f /clang/lib/Frontend/DependencyFile.cpp
parent72c24da063ec5fbebbf5b844cbe700c868bb5dba (diff)
downloadbcm5719-llvm-f3f846162a5d6b5b84ed7d146a29dc175542c2c0.tar.gz
bcm5719-llvm-f3f846162a5d6b5b84ed7d146a29dc175542c2c0.zip
Track the set of module maps read while building a .pcm file and reload those when preprocessing from that .pcm file.
llvm-svn: 306628
Diffstat (limited to 'clang/lib/Frontend/DependencyFile.cpp')
-rw-r--r--clang/lib/Frontend/DependencyFile.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Frontend/DependencyFile.cpp b/clang/lib/Frontend/DependencyFile.cpp
index bd14c53e4d1..561eb9c4a31 100644
--- a/clang/lib/Frontend/DependencyFile.cpp
+++ b/clang/lib/Frontend/DependencyFile.cpp
@@ -55,8 +55,8 @@ struct DepCollectorPPCallbacks : public PPCallbacks {
llvm::sys::path::remove_leading_dotslash(FE->getName());
DepCollector.maybeAddDependency(Filename, /*FromModule*/false,
- FileType != SrcMgr::C_User,
- /*IsModuleFile*/false, /*IsMissing*/false);
+ isSystem(FileType),
+ /*IsModuleFile*/false, /*IsMissing*/false);
}
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
@@ -265,7 +265,7 @@ bool DFGImpl::FileMatchesDepCriteria(const char *Filename,
if (IncludeSystemHeaders)
return true;
- return FileType == SrcMgr::C_User;
+ return !isSystem(FileType);
}
void DFGImpl::FileChanged(SourceLocation Loc,
OpenPOWER on IntegriCloud