Updates for review

(cherry picked from commit cb7bc8c)

Author: benlangmuir

clang/include/clang/CAS/CASOptions.h

@@ -117,7 +117,7 @@ class CASOptions : public CASConfiguration {
   /// default on-disk CAS, otherwise this is a noop.
   void ensurePersistentCAS();
 
-  std::string getResolvedCASPath() const;
+  void getResolvedCASPath(llvm::SmallVectorImpl<char> &Result) const;
 
 private:
   /// Initialize Cached CAS and ActionCache.

clang/lib/CAS/CASOptions.cpp

@@ -108,6 +108,7 @@ llvm::Error CASOptions::initCache() const {
   }
 
   SmallString<256> PathBuf;
+  getResolvedCASPath(PathBuf);
   if (CASPath == "auto") {
     getDefaultOnDiskCASPath(PathBuf);
     CASPath = PathBuf;
@@ -120,11 +121,10 @@ llvm::Error CASOptions::initCache() const {
   return llvm::Error::success();
 }
 
-std::string CASOptions::getResolvedCASPath() const {
-  if (CASPath != "auto")
-    return CASPath;
-
-  SmallString<256> PathBuf;
-  getDefaultOnDiskCASPath(PathBuf);
-  return std::string(PathBuf);
+void CASOptions::getResolvedCASPath(SmallVectorImpl<char> &Result) const {
+  if (CASPath == "auto") {
+    getDefaultOnDiskCASPath(Result);
+  } else {
+    Result.assign(CASPath.begin(), CASPath.end());
+  }
 }

clang/tools/driver/cc1depscan_main.cpp

@@ -836,8 +836,10 @@ void ScanServer::start(bool Exclusive, ArrayRef<const char *> CASArgs) {
     if (CASOpts.CASPath.empty() || !CASOpts.PluginPath.empty())
       return;
     SmallString<64> LLVMCasStorage;
+    SmallString<64> CASPath;
+    CASOpts.getResolvedCASPath(CASPath);
     ExitOnErr(llvm::cas::validateOnDiskUnifiedCASDatabasesIfNeeded(
-        CASOpts.getResolvedCASPath(), /*CheckHash=*/true,
+        CASPath, /*CheckHash=*/true,
         /*AllowRecovery=*/true,
         /*Force=*/false, findLLVMCasBinary(Argv0, LLVMCasStorage)));
   });

llvm/include/llvm/CAS/BuiltinUnifiedCASDatabases.h

@@ -29,7 +29,7 @@ enum class ValidationResult {
   /// The data is already valid.
   Valid,
   /// The data was invalid, but was recovered.
-  RecoveredValid,
+  Recovered,
   /// Validation was skipped, as it was not needed.
   Skipped,
 };
@@ -46,7 +46,7 @@ enum class ValidationResult {
 /// using the given \c llvm-cas executable which protects against crashes
 /// during validation. Otherwise validation is performed in-process.
 ///
-/// \returns \c Valid if the data is already valid, \c RecoveredValid if data
+/// \returns \c Valid if the data is already valid, \c Recovered if data
 /// was invalid but has been cleared, \c Skipped if validation is not needed,
 /// or an \c Error if validation cannot be performed or if the data is left
 /// in an invalid state because \p AllowRecovery is false.

llvm/include/llvm/CAS/UnifiedOnDiskCache.h

@@ -102,7 +102,7 @@ class UnifiedOnDiskCache {
   /// using the given \c llvm-cas executable which protects against crashes
   /// during validation. Otherwise validation is performed in-process.
   ///
-  /// \returns \c Valid if the data is already valid, \c RecoveredValid if data
+  /// \returns \c Valid if the data is already valid, \c Recovered if data
   /// was invalid but has been cleared, \c Skipped if validation is not needed,
   /// or an \c Error if validation cannot be performed or if the data is left
   /// in an invalid state because \p AllowRecovery is false.

llvm/lib/CAS/UnifiedOnDiskCache.cpp

@@ -469,7 +469,7 @@ UnifiedOnDiskCache::validateIfNeeded(StringRef RootPath, StringRef HashName,
       return createFileError(PathBuf, OS.error());
   }
 
-  return NeedsRecovery ? ValidationResult::RecoveredValid
+  return NeedsRecovery ? ValidationResult::Recovered
                        : ValidationResult::Valid;
 }
 

llvm/tools/llvm-cas/llvm-cas.cpp

@@ -776,7 +776,7 @@ int validateIfNeeded(StringRef Path, StringRef PluginPath,
   case ValidationResult::Valid:
     outs() << "validated successfully\n";
     break;
-  case ValidationResult::RecoveredValid:
+  case ValidationResult::Recovered:
     outs() << "recovered from invalid data\n";
     break;
   case ValidationResult::Skipped: