Use a common SourceManager when processing multiple files. This allows us to cache the contents of source files already loaded from disk.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@52066 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 11 insertions, 4 deletions

diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index 5eec67ca87..6f7e1a256b 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -1459,6 +1459,8 @@ int main(int argc, char **argv) {
     exit(1);
   }
   
+  llvm::OwningPtr<SourceManager> SourceMgr;
+  
   for (unsigned i = 0, e = InputFilenames.size(); i != e; ++i) {
     const std::string &InFile = InputFilenames[i];
     
@@ -1467,7 +1469,10 @@ int main(int argc, char **argv) {
     else {            
       /// Create a SourceManager object.  This tracks and owns all the file
       /// buffers allocated to a translation unit.
-      SourceManager SourceMgr;
+      if (!SourceMgr)
+        SourceMgr.reset(new SourceManager());
+      else
+        SourceMgr->clearIDTables();
       
       // Initialize language options, inferring file types from input filenames.
       LangOptions LangInfo;
@@ -1490,7 +1495,7 @@ int main(int argc, char **argv) {
       
       // Set up the preprocessor with these options.
       DriverPreprocessorFactory PPFactory(InFile, Diags, LangInfo, *Target,
-                                          SourceMgr, HeaderInfo);
+                                          *SourceMgr.get(), HeaderInfo);
       
       llvm::OwningPtr<Preprocessor> PP(PPFactory.CreatePreprocessor());
             
@@ -1498,13 +1503,14 @@ int main(int argc, char **argv) {
         continue;
       
       ProcessInputFile(*PP, PPFactory, InFile);
-      HeaderInfo.ClearFileInfo();
+      HeaderInfo.ClearFileInfo();      
       
       if (Stats)
-        SourceMgr.PrintStats();
+        SourceMgr->PrintStats();
     }
   }
   
+  
   delete Target;
 
   unsigned NumDiagnostics = Diags.getNumDiagnostics();
diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h
index 700dcd31ac..e5ebbf9dff 100644
--- a/include/clang/Basic/SourceManager.h
+++ b/include/clang/Basic/SourceManager.h
@@ -231,6 +231,7 @@ public:
   ~SourceManager() {}
   
   void clearIDTables() {
+    MainFileID = 0;
     FileIDs.clear();
     MacroIDs.clear();
     LastLineNoFileIDQuery = ~0U;