diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-09-13 20:44:41 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-09-13 20:44:41 +0000 |
| commit | f1312a828a2d482437823d757b7e6f32736b0a30 (patch) | |
| tree | b3edaf8bf6d28747ce384e1ff1b28de0079f3dab /clang/lib/Frontend | |
| parent | e3a6a82f1618dc3cfdd735e3e6fcb7a9e1150249 (diff) | |
| download | bcm5719-llvm-f1312a828a2d482437823d757b7e6f32736b0a30.tar.gz bcm5719-llvm-f1312a828a2d482437823d757b7e6f32736b0a30.zip | |
When building a module on-demand, clear out the "non-modular" language
and preprocessor options (such as macro definitions) first.
llvm-svn: 139638
Diffstat (limited to 'clang/lib/Frontend')
| -rw-r--r-- | clang/lib/Frontend/CompilerInstance.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index f39b119c326..ece9cd8406c 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -654,6 +654,9 @@ static void compileModule(CompilerInstance &ImportingInstance, // Construct a compiler invocation for creating this module. llvm::IntrusiveRefCntPtr<CompilerInvocation> Invocation (new CompilerInvocation(ImportingInstance.getInvocation())); + Invocation->getLangOpts().resetNonModularOptions(); + Invocation->getPreprocessorOpts().resetNonModularOptions(); + FrontendOptions &FrontendOpts = Invocation->getFrontendOpts(); FrontendOpts.OutputFile = ModuleFile.str(); FrontendOpts.DisableFree = false; |
