commit 7b02b583b23fac6f31e0645dc1c11340291ea4a3
author Douglas Gregor <dgregor@apple.com> Fri Aug 20 00:02:33 2010 +0000
committer Douglas Gregor <dgregor@apple.com> Fri Aug 20 00:02:33 2010 +0000
tree df2606c5765947f3221a58483cf894624e1bb7c1
parent a6480c124eb1e2fd2703a0c5951db9dcec07be43

When we decide not to reuse a precompiled preamble, clear out the
previous precompiled preamble completely. Fixes <rdar://problem/8330950>.

llvm-svn: 111590

clang/lib/Frontend/ASTUnit.cpp

diff --git a/clang/lib/Frontend/ASTUnit.cpp b/clang/lib/Frontend/ASTUnit.cpp
index 4395246..9c5fea4 100644
--- a/clang/lib/Frontend/ASTUnit.cpp
+++ b/clang/lib/Frontend/ASTUnit.cpp
@@ -698,9 +698,11 @@
   CleanTemporaryFiles();
   PreprocessedEntitiesByFile.clear();
 
-  if (!OverrideMainBuffer)
+  if (!OverrideMainBuffer) {
     StoredDiagnostics.clear();
-    
+    TopLevelDeclsInPreamble.clear();
+  }
+
   // Create a file manager object to provide access to and cache the filesystem.
   Clang.setFileManager(&getFileManager());
   
@@ -733,6 +735,9 @@
                         getSourceManager());
       StoredDiagnostics[I].setLocation(Loc);
     }
+  } else {
+    PreprocessorOpts.PrecompiledPreambleBytes.first = 0;
+    PreprocessorOpts.PrecompiledPreambleBytes.second = false;
   }
   
   llvm::OwningPtr<TopLevelDeclTrackerAction> Act;
@@ -1415,6 +1420,14 @@
   }
   
   // Remap files.
+  PreprocessorOptions &PPOpts = Invocation->getPreprocessorOpts();
+  for (PreprocessorOptions::remapped_file_buffer_iterator 
+         R = PPOpts.remapped_file_buffer_begin(),
+         REnd = PPOpts.remapped_file_buffer_end();
+       R != REnd; 
+       ++R) {
+    delete R->second;
+  }
   Invocation->getPreprocessorOpts().clearRemappedFiles();
   for (unsigned I = 0; I != NumRemappedFiles; ++I)
     Invocation->getPreprocessorOpts().addRemappedFile(RemappedFiles[I].first,
@@ -1772,6 +1785,9 @@
       FullSourceLoc Loc(StoredDiagnostics[I].getLocation(), SourceMgr);
       StoredDiagnostics[I].setLocation(Loc);
     }
+  } else {
+    PreprocessorOpts.PrecompiledPreambleBytes.first = 0;
+    PreprocessorOpts.PrecompiledPreambleBytes.second = false;
   }
 
   llvm::OwningPtr<SyntaxOnlyAction> Act;