commit f3f846162a5d6b5b84ed7d146a29dc175542c2c0
author Richard Smith <richard-llvm@metafoo.co.uk> Thu Jun 29 02:19:42 2017 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Thu Jun 29 02:19:42 2017 +0000
tree 77f0444b71827ec27ffb22111c45685d1bc4ea6f
parent 72c24da063ec5fbebbf5b844cbe700c868bb5dba

Track the set of module maps read while building a .pcm file and reload those when preprocessing from that .pcm file.

llvm-svn: 306628

clang/lib/Frontend/DependencyFile.cpp

diff --git a/clang/lib/Frontend/DependencyFile.cpp b/clang/lib/Frontend/DependencyFile.cpp
index bd14c53..561eb9c 100644
--- a/clang/lib/Frontend/DependencyFile.cpp
+++ b/clang/lib/Frontend/DependencyFile.cpp
@@ -55,8 +55,8 @@
         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 @@
   if (IncludeSystemHeaders)
     return true;
 
-  return FileType == SrcMgr::C_User;
+  return !isSystem(FileType);
 }
 
 void DFGImpl::FileChanged(SourceLocation Loc,