Author: Volodymyr Sapsai Date: 2020-02-21T13:56:50-08:00 New Revision: a6c8698924d2b31a2f096e0f4c06a7015ecccb5e
URL: https://github.com/llvm/llvm-project/commit/a6c8698924d2b31a2f096e0f4c06a7015ecccb5e DIFF: https://github.com/llvm/llvm-project/commit/a6c8698924d2b31a2f096e0f4c06a7015ecccb5e.diff LOG: clang/Modules: Finish renaming CompilerInstance::ModuleManager, NFC. Follow-up to 20d51b2f14ac4488f684f8fc57cb0ba718a6b91d, rename the setter to make it consistent with the getter. Also fixed a few comments along the way, didn't try to find all references to a module manager. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D74939 Added: Modified: clang/include/clang/Frontend/CompilerInstance.h clang/lib/Frontend/ChainedIncludesSource.cpp clang/lib/Frontend/CompilerInstance.cpp clang/lib/Frontend/FrontendAction.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Frontend/CompilerInstance.h b/clang/include/clang/Frontend/CompilerInstance.h index a935851d5b60..4a6e293b7ffb 100644 --- a/clang/include/clang/Frontend/CompilerInstance.h +++ b/clang/include/clang/Frontend/CompilerInstance.h @@ -515,7 +515,7 @@ class CompilerInstance : public ModuleLoader { /// { IntrusiveRefCntPtr<ASTReader> getASTReader() const; - void setModuleManager(IntrusiveRefCntPtr<ASTReader> Reader); + void setASTReader(IntrusiveRefCntPtr<ASTReader> Reader); std::shared_ptr<ModuleDependencyCollector> getModuleDepCollector() const; void setModuleDepCollector( @@ -781,7 +781,6 @@ class CompilerInstance : public ModuleLoader { return std::move(OutputStream); } - // Create module manager. void createASTReader(); bool loadModuleFile(StringRef FileName); diff --git a/clang/lib/Frontend/ChainedIncludesSource.cpp b/clang/lib/Frontend/ChainedIncludesSource.cpp index dec281529b9e..1486adf70c3f 100644 --- a/clang/lib/Frontend/ChainedIncludesSource.cpp +++ b/clang/lib/Frontend/ChainedIncludesSource.cpp @@ -189,7 +189,7 @@ IntrusiveRefCntPtr<ExternalSemaSource> clang::createChainedIncludesSource( Clang->getASTConsumer().GetASTDeserializationListener()); if (!Reader) return nullptr; - Clang->setModuleManager(Reader); + Clang->setASTReader(Reader); Clang->getASTContext().setExternalSource(Reader); } diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index fe787918b41b..bf246f48f7ff 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -138,7 +138,7 @@ std::unique_ptr<Sema> CompilerInstance::takeSema() { IntrusiveRefCntPtr<ASTReader> CompilerInstance::getASTReader() const { return TheASTReader; } -void CompilerInstance::setModuleManager(IntrusiveRefCntPtr<ASTReader> Reader) { +void CompilerInstance::setASTReader(IntrusiveRefCntPtr<ASTReader> Reader) { assert(ModuleCache.get() == &Reader->getModuleManager().getModuleCache() && "Expected ASTReader to use the same PCM cache"); TheASTReader = std::move(Reader); @@ -379,7 +379,7 @@ static void InitializeFileRemapping(DiagnosticsEngine &Diags, void CompilerInstance::createPreprocessor(TranslationUnitKind TUKind) { const PreprocessorOptions &PPOpts = getPreprocessorOpts(); - // The module manager holds a reference to the old preprocessor (if any). + // The AST reader holds a reference to the old preprocessor (if any). TheASTReader.reset(); // Create the Preprocessor. diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp index 99f022786e6b..1dc85d967ca0 100644 --- a/clang/lib/Frontend/FrontendAction.cpp +++ b/clang/lib/Frontend/FrontendAction.cpp @@ -840,7 +840,7 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI, source = createChainedIncludesSource(CI, FinalReader); if (!source) goto failure; - CI.setModuleManager(static_cast<ASTReader *>(FinalReader.get())); + CI.setASTReader(static_cast<ASTReader *>(FinalReader.get())); CI.getASTContext().setExternalSource(source); } else if (CI.getLangOpts().Modules || !CI.getPreprocessorOpts().ImplicitPCHInclude.empty()) { @@ -870,7 +870,7 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI, if (!CI.getASTContext().getExternalSource()) goto failure; } - // If modules are enabled, create the module manager before creating + // If modules are enabled, create the AST reader before creating // any builtins, so that all declarations know that they might be // extended by an external source. if (CI.getLangOpts().Modules || !CI.hasASTContext() || _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits