[PATCH] D74939: clang/Modules: Finish renaming CompilerInstance::ModuleManager, NFC.
Volodymyr Sapsai via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Feb 20 17:50:06 PST 2020
vsapsai created this revision.
vsapsai added reviewers: dexonsmith, bruno, Bigcheese.
Herald added subscribers: ributzka, jkorous.
Herald added a project: clang.
Follow-up to 20d51b2f14ac4488f684f8fc57cb0ba718a6b91d <https://reviews.llvm.org/rG20d51b2f14ac4488f684f8fc57cb0ba718a6b91d>, 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.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D74939
Files:
clang/include/clang/Frontend/CompilerInstance.h
clang/lib/Frontend/ChainedIncludesSource.cpp
clang/lib/Frontend/CompilerInstance.cpp
clang/lib/Frontend/FrontendAction.cpp
Index: clang/lib/Frontend/FrontendAction.cpp
===================================================================
--- clang/lib/Frontend/FrontendAction.cpp
+++ clang/lib/Frontend/FrontendAction.cpp
@@ -840,7 +840,7 @@
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 @@
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() ||
Index: clang/lib/Frontend/CompilerInstance.cpp
===================================================================
--- clang/lib/Frontend/CompilerInstance.cpp
+++ clang/lib/Frontend/CompilerInstance.cpp
@@ -138,7 +138,7 @@
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 @@
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.
Index: clang/lib/Frontend/ChainedIncludesSource.cpp
===================================================================
--- clang/lib/Frontend/ChainedIncludesSource.cpp
+++ clang/lib/Frontend/ChainedIncludesSource.cpp
@@ -189,7 +189,7 @@
Clang->getASTConsumer().GetASTDeserializationListener());
if (!Reader)
return nullptr;
- Clang->setModuleManager(Reader);
+ Clang->setASTReader(Reader);
Clang->getASTContext().setExternalSource(Reader);
}
Index: clang/include/clang/Frontend/CompilerInstance.h
===================================================================
--- clang/include/clang/Frontend/CompilerInstance.h
+++ clang/include/clang/Frontend/CompilerInstance.h
@@ -515,7 +515,7 @@
/// {
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 @@
return std::move(OutputStream);
}
- // Create module manager.
void createASTReader();
bool loadModuleFile(StringRef FileName);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D74939.245775.patch
Type: text/x-patch
Size: 3293 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200221/45973b0a/attachment-0001.bin>
More information about the cfe-commits
mailing list