fixup! move label encoding/decoding into FunctionCallLabel structure

Author: Michael137

lldb/include/lldb/Expression/Expression.h

@@ -121,6 +121,21 @@ struct FunctionCallLabel {
   /// perform the function call. For example, for DWARF this would
   /// be the DIE UID.
   lldb::user_id_t symbol_id;
+
+  /// Decodes the specified function \c label into a \c FunctionCallLabel.
+  static llvm::Expected<FunctionCallLabel> fromString(llvm::StringRef label);
+
+  /// Encode this FunctionCallLabel into it's string representation.
+  ///
+  /// The representation roundtrips through \c fromString:
+  /// \code{.cpp}
+  /// llvm::StringRef encoded = "$__lldb_func:_Z3foov:0x0:0x0";
+  /// FunctionCallLabel label = *fromString(label);
+  ///
+  /// assert (label.toString() == encoded);
+  /// assert (*fromString(label.toString()) == label);
+  /// \endcode
+  std::string toString() const;
 };
 
 /// LLDB attaches this prefix to mangled names of functions that it get called
@@ -134,10 +149,6 @@ inline constexpr llvm::StringRef FunctionCallLabelPrefix = "$__lldb_func";
 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

lldb/source/Expression/Expression.cpp

@@ -51,7 +51,7 @@ lldb_private::splitFunctionCallLabel(llvm::StringRef label) {
 }
 
 llvm::Expected<FunctionCallLabel>
-lldb_private::makeFunctionCallLabel(llvm::StringRef label) {
+lldb_private::FunctionCallLabel::fromString(llvm::StringRef label) {
   auto components_or_err = splitFunctionCallLabel(label);
   if (!components_or_err)
     return llvm::joinErrors(
@@ -76,3 +76,9 @@ lldb_private::makeFunctionCallLabel(llvm::StringRef label) {
   return FunctionCallLabel{/*.lookup_name=*/components[0],
                            /*.module_id=*/module_id, /*.symbol_id=*/die_id};
 }
+
+std::string lldb_private::FunctionCallLabel::toString() const {
+  return llvm::formatv("{0}:{1}:{2:x}:{3:x}", FunctionCallLabelPrefix,
+                       lookup_name, module_id, symbol_id)
+      .str();
+}

lldb/source/Expression/IRExecutionUnit.cpp

@@ -790,7 +790,7 @@ ResolveFunctionCallLabel(llvm::StringRef name,
   if (!sc.target_sp)
     return llvm::createStringError("target not available.");
 
-  auto label_or_err = makeFunctionCallLabel(name);
+  auto label_or_err = FunctionCallLabel::fromString(name);
   if (!label_or_err)
     return llvm::joinErrors(
         llvm::createStringError("failed to create FunctionCallLabel from: %s",

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp

@@ -267,9 +267,10 @@ static std::optional<std::string> MakeLLDBFuncAsmLabel(const DWARFDIE &die) {
   if (die_id == LLDB_INVALID_UID)
     return std::nullopt;
 
-  return llvm::formatv("{0}:{1}:{2:x}:{3:x}", FunctionCallLabelPrefix, name,
-                       module_id, die_id)
-      .str();
+  return FunctionCallLabel{/*.lookup_name=*/name,
+                           /*module_id=*/module_id,
+                           /*symbol_id=*/die_id}
+      .toString();
 }
 
 TypeSP DWARFASTParserClang::ParseTypeFromClangModule(const SymbolContext &sc,