When building a module on-demand, clear out the "non-modular" language

and preprocessor options (such as macro definitions) first.


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

1 files changed, 10 insertions, 0 deletions

diff --git a/include/clang/Frontend/PreprocessorOptions.h b/include/clang/Frontend/PreprocessorOptions.h
index 040b845199..3df6512600 100644
--- a/include/clang/Frontend/PreprocessorOptions.h
+++ b/include/clang/Frontend/PreprocessorOptions.h
@@ -190,6 +190,16 @@ public:
     RemappedFiles.clear();
     RemappedFileBuffers.clear();
   }
+  
+  /// \brief Reset any options that are not considered when building a
+  /// module.
+  void resetNonModularOptions() {
+    Macros.clear();
+    MacroIncludes.clear();
+    DumpDeserializedPCHDecls = false;
+    TokenCache.clear();
+    RetainRemappedFileBuffers = true;
+  }
 };
 
 } // end namespace clang