diff options
Diffstat (limited to 'lib/Frontend')
| -rw-r--r-- | lib/Frontend/ASTUnit.cpp | 4 | ||||
| -rw-r--r-- | lib/Frontend/FrontendActions.cpp | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp index e08417ddcf..7436efba41 100644 --- a/lib/Frontend/ASTUnit.cpp +++ b/lib/Frontend/ASTUnit.cpp @@ -924,7 +924,7 @@ class PrecompilePreambleConsumer : public PCHGenerator { public: PrecompilePreambleConsumer(ASTUnit &Unit, const Preprocessor &PP, StringRef isysroot, raw_ostream *Out) - : PCHGenerator(PP, "", /*IsModule=*/false, isysroot, Out), Unit(Unit), + : PCHGenerator(PP, "", 0, isysroot, Out), Unit(Unit), Hash(Unit.getCurrentTopLevelHashValue()) { Hash = 0; } @@ -2423,7 +2423,7 @@ bool ASTUnit::serialize(raw_ostream &OS) { llvm::BitstreamWriter Stream(Buffer); ASTWriter Writer(Stream); // FIXME: Handle modules - Writer.WriteAST(getSema(), 0, std::string(), /*IsModule=*/false, ""); + Writer.WriteAST(getSema(), 0, std::string(), 0, ""); // Write the generated bitstream to "Out". if (!Buffer.empty()) diff --git a/lib/Frontend/FrontendActions.cpp b/lib/Frontend/FrontendActions.cpp index 418dbf4cd8..0cbcde5bda 100644 --- a/lib/Frontend/FrontendActions.cpp +++ b/lib/Frontend/FrontendActions.cpp @@ -86,8 +86,7 @@ ASTConsumer *GeneratePCHAction::CreateASTConsumer(CompilerInstance &CI, if (!CI.getFrontendOpts().RelocatablePCH) Sysroot.clear(); - return new PCHGenerator(CI.getPreprocessor(), OutputFile, /*Module=*/false, - Sysroot, OS); + return new PCHGenerator(CI.getPreprocessor(), OutputFile, 0, Sysroot, OS); } bool GeneratePCHAction::ComputeASTConsumerArguments(CompilerInstance &CI, @@ -122,7 +121,7 @@ ASTConsumer *GenerateModuleAction::CreateASTConsumer(CompilerInstance &CI, if (ComputeASTConsumerArguments(CI, InFile, Sysroot, OutputFile, OS)) return 0; - return new PCHGenerator(CI.getPreprocessor(), OutputFile, /*MakeModule=*/true, + return new PCHGenerator(CI.getPreprocessor(), OutputFile, Module, Sysroot, OS); } @@ -184,8 +183,7 @@ bool GenerateModuleAction::BeginSourceFileAction(CompilerInstance &CI, } // Dig out the module definition. - ModuleMap::Module *Module = HS.getModule(CI.getLangOpts().CurrentModule, - /*AllowSearch=*/false); + Module = HS.getModule(CI.getLangOpts().CurrentModule, /*AllowSearch=*/false); if (!Module) { CI.getDiagnostics().Report(diag::err_missing_module) << CI.getLangOpts().CurrentModule << Filename; |