Switch from StringRef to std::string in PluginProps::GetCachePath

Author: Kevin Frei

lldb/source/Plugins/SymbolLocator/Debuginfod/SymbolLocatorDebuginfod.cpp

@@ -57,21 +57,19 @@ class PluginProperties : public Properties {
     return urls;
   }
 
-  llvm::Expected<llvm::StringRef> GetCachePath() {
+  llvm::Expected<std::string> GetCachePath() {
     OptionValueString *s =
         m_collection_sp->GetPropertyAtIndexAsOptionValueString(
             ePropertySymbolCachePath);
     // If we don't have a valid cache location, use the default one.
     if (!s || !s->GetCurrentValueAsRef().size()) {
       llvm::Expected<std::string> maybeCachePath =
           llvm::getDefaultDebuginfodCacheDirectory();
-      if (!maybeCachePath) {
+      if (!maybeCachePath)
         return maybeCachePath;
-      }
-      m_cache_path = *maybeCachePath;
-      return llvm::StringRef(m_cache_path);
+      return *maybeCachePath;
     }
-    return s->GetCurrentValueAsRef();
+    return s->GetCurrentValue();
   }
 
   std::chrono::milliseconds GetTimeout() const {
@@ -96,7 +94,6 @@ class PluginProperties : public Properties {
   }
   // Storage for the StringRef's used within the Debuginfod library.
   Args m_server_urls;
-  std::string m_cache_path;
 };
 
 } // namespace
@@ -157,12 +154,11 @@ GetFileForModule(const ModuleSpec &module_spec,
   // Grab LLDB's Debuginfod overrides from the
   // plugin.symbol-locator.debuginfod.* settings.
   PluginProperties &plugin_props = GetGlobalPluginProperties();
-  llvm::Expected<llvm::StringRef> cache_path_or_err =
-      plugin_props.GetCachePath();
+  llvm::Expected<std::string> cache_path_or_err = plugin_props.GetCachePath();
   // A cache location is *required*.
   if (!cache_path_or_err)
     return {};
-  llvm::StringRef cache_path = *cache_path_or_err;
+  std::string cache_path = *cache_path_or_err;
   llvm::SmallVector<llvm::StringRef> debuginfod_urls =
       llvm::getDefaultDebuginfodUrls();
   std::chrono::milliseconds timeout = plugin_props.GetTimeout();

llvm/include/llvm/Debuginfod/Debuginfod.h

@@ -46,7 +46,7 @@ bool canUseDebuginfod();
 /// environment variable.
 SmallVector<StringRef> getDefaultDebuginfodUrls();
 
-/// Creates the cache-key for a given Debuginfod UrlPath
+/// Returns the cache key for a given debuginfod URL path.
 std::string getDebuginfodCacheKey(StringRef UrlPath);
 
 /// Sets the list of debuginfod server URLs to query. This overrides the
@@ -61,7 +61,8 @@ Expected<std::string> getDefaultDebuginfodCacheDirectory();
 /// DEBUGINFOD_TIMEOUT environment variable, default is 90 seconds (90000 ms).
 std::chrono::milliseconds getDefaultDebuginfodTimeout();
 
-/// Get the full UrlPath for a source request of a given BuildID and file path.
+/// Get the full URL path for a source request of a given BuildID and file
+/// path.
 std::string getDebuginfodSourceUrlPath(object::BuildIDRef ID,
                                        StringRef SourceFilePath);
 
@@ -70,14 +71,14 @@ std::string getDebuginfodSourceUrlPath(object::BuildIDRef ID,
 Expected<std::string> getCachedOrDownloadSource(object::BuildIDRef ID,
                                                 StringRef SourceFilePath);
 
-/// Get the full UrlPath for an Executable request of a given BuildID.
+/// Get the full URL path for an executable request of a given BuildID.
 std::string getDebuginfodExecutableUrlPath(object::BuildIDRef ID);
 
 /// Fetches an executable by searching the default local cache directory and
 /// server URLs.
 Expected<std::string> getCachedOrDownloadExecutable(object::BuildIDRef ID);
 
-/// Get the full UrlPath for a debug binary request of a given BuildID.
+/// Get the full URL path for a debug binary request of a given BuildID.
 std::string getDebuginfodDebuginfoUrlPath(object::BuildIDRef ID);
 
 /// Fetches a debug binary by searching the default local cache directory and