use std::string instead of llvm::StringRef

Author: charles-zablit

lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp

@@ -1911,7 +1911,7 @@ SwiftLanguage::GetDemangledFunctionNameWithoutArguments(Mangled mangled) const {
   return mangled_name;
 }
 
-static llvm::Expected<std::pair<llvm::StringRef, DemangledNameInfo>>
+static llvm::Expected<std::pair<std::string, DemangledNameInfo>>
 GetAndValidateInfo(const SymbolContext &sc) {
   Mangled mangled = sc.GetPossiblyInlinedFunctionName();
   if (!mangled)
@@ -1941,19 +1941,19 @@ GetAndValidateInfo(const SymbolContext &sc) {
   return std::make_pair(demangled_name, info);
 }
 
-static llvm::Expected<llvm::StringRef>
+static llvm::Expected<std::string>
 GetDemangledBasename(const SymbolContext &sc) {
   auto info_or_err = GetAndValidateInfo(sc);
   if (!info_or_err)
     return info_or_err.takeError();
 
   auto [demangled_name, info] = *info_or_err;
 
-  return demangled_name.slice(info.BasenameRange.first,
-                              info.BasenameRange.second);
+  return demangled_name.substr(info.BasenameRange.first,
+                               info.BasenameRange.second);
 }
 
-static llvm::Expected<llvm::StringRef>
+static llvm::Expected<std::string>
 GetDemangledFunctionPrefix(const SymbolContext &sc) {
   auto info_or_err = GetAndValidateInfo(sc);
   if (!info_or_err)
@@ -1966,10 +1966,10 @@ GetDemangledFunctionPrefix(const SymbolContext &sc) {
         "DemangledInfo for '%s does not have suffix range.",
         demangled_name.data());
 
-  return demangled_name.slice(info.PrefixRange.first, info.PrefixRange.second);
+  return demangled_name.substr(info.PrefixRange.first, info.PrefixRange.second);
 }
 
-static llvm::Expected<llvm::StringRef>
+static llvm::Expected<std::string>
 GetDemangledFunctionSuffix(const SymbolContext &sc) {
   auto info_or_err = GetAndValidateInfo(sc);
   if (!info_or_err)
@@ -1982,7 +1982,7 @@ GetDemangledFunctionSuffix(const SymbolContext &sc) {
         "DemangledInfo for '%s does not have suffix range.",
         demangled_name.data());
 
-  return demangled_name.slice(info.SuffixRange.first, info.SuffixRange.second);
+  return demangled_name.substr(info.SuffixRange.first, info.SuffixRange.second);
 }
 
 static bool PrintDemangledArgumentList(Stream &s, const SymbolContext &sc) {
@@ -2000,8 +2000,8 @@ static bool PrintDemangledArgumentList(Stream &s, const SymbolContext &sc) {
   if (!info.hasArguments())
     return false;
 
-  s << demangled_name.slice(info.ArgumentsRange.first,
-                            info.ArgumentsRange.second);
+  s << demangled_name.substr(info.ArgumentsRange.first,
+                             info.ArgumentsRange.second);
 
   return true;
 }

lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py

@@ -3,7 +3,6 @@
 from lldbsuite.test.lldbtest import TestBase
 import lldbsuite.test.lldbutil as lldbutil
 
-
 class TestCase(TestBase):
 
     @swiftTest
@@ -32,6 +31,6 @@ def do_backtrace(self, arg):
                 ".sleep(",
                 "`second() at main.swift:6",
                 "`first() at main.swift:2",
-                "`closure #1 in static Main.main() at main.swift:12",
+                "`closure #1() at main.swift:12:19",
             ],
         )

lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py

@@ -33,7 +33,7 @@ def do_backtrace_selected_task(self, arg):
                 ".sleep(",
                 "`second() at main.swift:6:",
                 "`first() at main.swift:2:",
-                "`closure #1 in static Main.main() at main.swift:12:",
+                "`closure #1() at main.swift:12:",
             ],
         )