createCASDatabases -> getOrCreateCASDatabases

Author: jansvoboda11

clang/include/clang/Frontend/CompilerInstance.h

@@ -530,12 +530,6 @@ class CompilerInstance : public ModuleLoader {
   /// Get the CAS, or create it using the configuration in CompilerInvocation.
   llvm::cas::ObjectStore &getOrCreateObjectStore();
   llvm::cas::ActionCache &getOrCreateActionCache();
-  std::shared_ptr<llvm::cas::ObjectStore> getObjectStorePtr() const {
-    return CAS;
-  }
-  std::shared_ptr<llvm::cas::ActionCache> getActionCachePtr() const {
-    return ActionCache;
-  }
 
   /// @}
   /// @name Source Manager
@@ -1046,7 +1040,7 @@ class CompilerInstance : public ModuleLoader {
 
   std::pair<std::shared_ptr<llvm::cas::ObjectStore>,
             std::shared_ptr<llvm::cas::ActionCache>>
-  createCASDatabases();
+  getOrCreateCASDatabases();
 };
 
 } // end namespace clang

clang/lib/Frontend/CompileJobCache.cpp

@@ -296,8 +296,7 @@ std::optional<int> CompileJobCache::initialize(CompilerInstance &Clang) {
   if (!CacheCompileJob)
     return std::nullopt;
 
-  CAS = Clang.getObjectStorePtr();
-  Cache = Clang.getActionCachePtr();
+  std::tie(CAS, Cache) = Clang.getOrCreateCASDatabases();
   if (!CAS || !Cache)
     return 1; // Exit with error!
 

clang/lib/Frontend/CompilerInstance.cpp

@@ -974,7 +974,7 @@ llvm::vfs::OutputBackend &CompilerInstance::getOrCreateOutputManager() {
 
 std::pair<std::shared_ptr<llvm::cas::ObjectStore>,
           std::shared_ptr<llvm::cas::ActionCache>>
-CompilerInstance::createCASDatabases() {
+CompilerInstance::getOrCreateCASDatabases() {
   // Create a new CAS databases from the CompilerInvocation. Future calls to
   // createFileManager() will use the same CAS.
   std::tie(CAS, ActionCache) =
@@ -986,13 +986,13 @@ CompilerInstance::createCASDatabases() {
 
 llvm::cas::ObjectStore &CompilerInstance::getOrCreateObjectStore() {
   if (!CAS)
-    createCASDatabases();
+    getOrCreateCASDatabases();
   return *CAS;
 }
 
 llvm::cas::ActionCache &CompilerInstance::getOrCreateActionCache() {
   if (!ActionCache)
-    createCASDatabases();
+    getOrCreateCASDatabases();
   return *ActionCache;
 }