Merge commit 'e0661680f912' from swift/release/6.2 into stable/20240723

Author: git apple-llvm automerger

lldb/include/lldb/Target/Language.h

@@ -409,8 +409,7 @@ class Language : public PluginInterface {
   /// returns the name of the parent function where the input closure was
   /// defined. Returns an empty string if there is no such parent, or if the
   /// query does not make sense for this language.
-  virtual std::string
-  GetParentNameIfClosure(llvm::StringRef mangled_name) const {
+  virtual std::string GetParentNameIfClosure(Function &function) const {
     return "";
   }
 

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

@@ -2167,9 +2167,8 @@ SwiftLanguage::AreEqualForFrameComparison(const SymbolContext &sc1,
   llvm_unreachable("unhandled enumeration in AreEquivalentFunctions");
 }
 
-std::string
-SwiftLanguage::GetParentNameIfClosure(llvm::StringRef mangled_name) const {
-  return SwiftLanguageRuntime::GetParentNameIfClosure(mangled_name);
+std::string SwiftLanguage::GetParentNameIfClosure(Function &func) const {
+  return SwiftLanguageRuntime::GetParentNameIfClosure(func);
 }
 
 //------------------------------------------------------------------

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

@@ -113,8 +113,7 @@ class SwiftLanguage : public Language {
   AreEqualForFrameComparison(const SymbolContext &sc1,
                              const SymbolContext &sc2) const override;
 
-  std::string
-  GetParentNameIfClosure(llvm::StringRef mangled_name) const override;
+  std::string GetParentNameIfClosure(Function &func) const override;
   //------------------------------------------------------------------
   // Static Functions
   //------------------------------------------------------------------

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h

@@ -205,7 +205,7 @@ class SwiftLanguageRuntime : public LanguageRuntime {
                          const SymbolContext *sc = nullptr,
                          const ExecutionContext *exe_ctx = nullptr);
 
-  static std::string GetParentNameIfClosure(llvm::StringRef mangled_name);
+  static std::string GetParentNameIfClosure(Function &func);
 
   /// Demangle a symbol to a swift::Demangle node tree.
   ///

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeNames.cpp

@@ -1499,9 +1499,10 @@ SwiftLanguageRuntime::GetGenericSignature(llvm::StringRef function_name,
   return signature;
 }
 
-std::string SwiftLanguageRuntime::GetParentNameIfClosure(StringRef name) {
+std::string SwiftLanguageRuntime::GetParentNameIfClosure(Function &func) {
   using Kind = Node::Kind;
   swift::Demangle::Context ctx;
+  ConstString name = func.GetMangled().GetMangledName();
   auto *node = SwiftLanguageRuntime::DemangleSymbolAsNode(name, ctx);
   if (!node || node->getKind() != Node::Kind::Global)
     return "";

lldb/source/Target/Language.cpp

@@ -601,8 +601,7 @@ GetParentFunctionsWhileClosure(const SymbolContext &sc,
 
   parents.push_back(root);
   for (int idx = 0; idx < upper_limit; idx++) {
-    ConstString mangled = root->GetMangled().GetMangledName();
-    std::string parent = language.GetParentNameIfClosure(mangled);
+    std::string parent = language.GetParentNameIfClosure(*root);
     if (parent.empty())
       break;