fixup! move FunctionCallLabel APIs into Expression component

Michael137 · Michael137 · commit 377ba3114074 · 2025-07-28T12:41:58.000+01:00
diff --git a/lldb/include/lldb/Expression/Expression.h b/lldb/include/lldb/Expression/Expression.h
@@ -127,6 +127,17 @@ struct FunctionCallLabel {
 /// from JITted expressions.
 inline constexpr llvm::StringRef FunctionCallLabelPrefix = "$__lldb_func";
 
+/// Returns the components of the specified function call label.
+///
+/// The format of \c label is described in \c FunctionCallLabel.
+/// The label prefix is not one of the components.
+llvm::Expected<llvm::SmallVector<llvm::StringRef, 3>>
+splitFunctionCallLabel(llvm::StringRef label);
+
+// Decodes the function label into a \c FunctionCallLabel.
+llvm::Expected<FunctionCallLabel>
+makeFunctionCallLabel(llvm::StringRef label);
+
 } // namespace lldb_private
 
 #endif // LLDB_EXPRESSION_EXPRESSION_H
diff --git a/lldb/include/lldb/Symbol/TypeSystem.h b/lldb/include/lldb/Symbol/TypeSystem.h
@@ -549,21 +549,6 @@ class TypeSystem : public PluginInterface,
     return m_has_forcefully_completed_types;
   }
 
-  /// Returns the components of the specified function call label.
-  ///
-  /// The format of \c label is described in \c FunctionCallLabel.
-  /// The label prefix is not one of the components.
-  virtual llvm::Expected<llvm::SmallVector<llvm::StringRef, 3>>
-  splitFunctionCallLabel(llvm::StringRef label) const {
-    return llvm::createStringError("Not implemented.");
-  }
-
-  // Decodes the function label into a \c FunctionCallLabel.
-  virtual llvm::Expected<FunctionCallLabel>
-  makeFunctionCallLabel(llvm::StringRef label) const {
-    return llvm::createStringError("Not implemented.");
-  }
-
 protected:
   SymbolFile *m_sym_file = nullptr;
   /// Used for reporting statistics.
diff --git a/lldb/source/Expression/Expression.cpp b/lldb/source/Expression/Expression.cpp
@@ -10,6 +10,10 @@
 #include "lldb/Target/ExecutionContextScope.h"
 #include "lldb/Target/Target.h"
 
+#include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/Support/Error.h"
+
 using namespace lldb_private;
 
 Expression::Expression(Target &target)
@@ -26,3 +30,49 @@ Expression::Expression(ExecutionContextScope &exe_scope)
       m_jit_end_addr(LLDB_INVALID_ADDRESS) {
   assert(m_target_wp.lock());
 }
+
+llvm::Expected<llvm::SmallVector<llvm::StringRef, 3>>
+lldb_private::splitFunctionCallLabel(llvm::StringRef label) {
+  if (!label.consume_front(FunctionCallLabelPrefix))
+    return llvm::createStringError(
+        "expected function call label prefix not found in %s", label.data());
+  if (!label.consume_front(":"))
+    return llvm::createStringError(
+        "incorrect format: expected ':' as the first character.");
+
+  llvm::SmallVector<llvm::StringRef, 3> components;
+  label.split(components, ":");
+
+  if (components.size() != 3)
+    return llvm::createStringError(
+        "incorrect format: too many label subcomponents.");
+
+  return components;
+}
+
+llvm::Expected<FunctionCallLabel>
+lldb_private::makeFunctionCallLabel(llvm::StringRef label) {
+  auto components_or_err = splitFunctionCallLabel(label);
+  if (!components_or_err)
+    return llvm::joinErrors(
+        llvm::createStringError("Failed to decode function call label"),
+        components_or_err.takeError());
+
+  const auto &components = *components_or_err;
+
+  llvm::StringRef module_label = components[1];
+  llvm::StringRef die_label = components[2];
+
+  lldb::user_id_t module_id = 0;
+  if (module_label.consumeInteger(0, module_id))
+    return llvm::createStringError(
+        llvm::formatv("failed to parse module ID from '{0}'.", components[1]));
+
+  lldb::user_id_t die_id;
+  if (die_label.consumeInteger(/*Radix=*/0, die_id))
+    return llvm::createStringError(
+        llvm::formatv("failed to parse DIE ID from '{0}'.", components[2]));
+
+  return FunctionCallLabel{/*.lookup_name=*/components[0],
+                           /*.module_id=*/module_id, /*.symbol_id=*/die_id};
+}
diff --git a/lldb/source/Expression/IRExecutionUnit.cpp b/lldb/source/Expression/IRExecutionUnit.cpp
@@ -790,17 +790,7 @@ ResolveFunctionCallLabel(llvm::StringRef name,
   if (!sc.target_sp)
     return llvm::createStringError("target not available.");
 
-  auto ts_or_err = sc.target_sp->GetScratchTypeSystemForLanguage(
-      lldb::eLanguageTypeC_plus_plus);
-  if (!ts_or_err || !*ts_or_err)
-    return llvm::joinErrors(
-        llvm::createStringError(
-            "failed to find scratch C++ TypeSystem for current target."),
-        ts_or_err.takeError());
-
-  auto ts_sp = *ts_or_err;
-
-  auto label_or_err = ts_sp->makeFunctionCallLabel(name);
+  auto label_or_err = makeFunctionCallLabel(name);
   if (!label_or_err)
     return llvm::joinErrors(
         llvm::createStringError("failed to create FunctionCallLabel from: %s",
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -9053,6 +9053,8 @@ ConstString TypeSystemClang::DeclGetMangledName(void *opaque_decl) {
   if (!mc || !mc->shouldMangleCXXName(nd))
     return {};
 
+  // We have a LLDB FunctionCallLabel instead of an ordinary mangled name.
+  // Extract the mangled name out of this label.
   if (const auto *label = nd->getAttr<AsmLabelAttr>()) {
     if (auto components_or_err = splitFunctionCallLabel(label->getLabel()))
       return ConstString((*components_or_err)[0]);
@@ -9782,49 +9784,3 @@ void TypeSystemClang::LogCreation() const {
     LLDB_LOG(log, "Created new TypeSystem for (ASTContext*){0:x} '{1}'",
              &getASTContext(), getDisplayName());
 }
-
-llvm::Expected<llvm::SmallVector<llvm::StringRef, 3>>
-TypeSystemClang::splitFunctionCallLabel(llvm::StringRef label) const {
-  if (!label.consume_front(FunctionCallLabelPrefix))
-    return llvm::createStringError(
-        "expected function call label prefix not found in %s", label.data());
-  if (!label.consume_front(":"))
-    return llvm::createStringError(
-        "incorrect format: expected ':' as the first character.");
-
-  llvm::SmallVector<llvm::StringRef, 3> components;
-  label.split(components, ":");
-
-  if (components.size() != 3)
-    return llvm::createStringError(
-        "incorrect format: too many label subcomponents.");
-
-  return components;
-}
-
-llvm::Expected<FunctionCallLabel>
-TypeSystemClang::makeFunctionCallLabel(llvm::StringRef label) const {
-  auto components_or_err = splitFunctionCallLabel(label);
-  if (!components_or_err)
-    return llvm::joinErrors(
-        llvm::createStringError("Failed to decode function call label"),
-        components_or_err.takeError());
-
-  const auto &components = *components_or_err;
-
-  llvm::StringRef module_label = components[1];
-  llvm::StringRef die_label = components[2];
-
-  lldb::user_id_t module_id = 0;
-  if (module_label.consumeInteger(0, module_id))
-    return llvm::createStringError(
-        llvm::formatv("failed to parse module ID from '{0}'.", components[1]));
-
-  lldb::user_id_t die_id;
-  if (die_label.consumeInteger(/*Radix=*/0, die_id))
-    return llvm::createStringError(
-        llvm::formatv("failed to parse DIE ID from '{0}'.", components[2]));
-
-  return FunctionCallLabel{/*.lookup_name=*/components[0],
-                           /*.module_id=*/module_id, /*.symbol_id=*/die_id};
-}
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
@@ -1099,12 +1099,6 @@ class TypeSystemClang : public TypeSystem {
       lldb::opaque_compiler_type_t type, Stream &s,
       lldb::DescriptionLevel level = lldb::eDescriptionLevelFull) override;
 
-  llvm::Expected<llvm::SmallVector<llvm::StringRef, 3>>
-  splitFunctionCallLabel(llvm::StringRef label) const override;
-
-  llvm::Expected<FunctionCallLabel>
-  makeFunctionCallLabel(llvm::StringRef label) const override;
-
   static void DumpTypeName(const CompilerType &type);
 
   static clang::EnumDecl *GetAsEnumDecl(const CompilerType &type);
