fixup! rename FunctionCallLabel members

Author: Michael137

lldb/include/lldb/Expression/Expression.h

@@ -102,16 +102,25 @@ class Expression {
 ///
 /// The format being:
 ///
-///   <prefix>:<mangled name>:<module id>:<DIE id>
+///   <prefix>:<mangled name>:<module uid>:<symbol uid>
 ///
 /// The label string needs to stay valid for the entire lifetime
 /// of this object.
 struct FunctionCallLabel {
-  llvm::StringRef m_lookup_name;
-  lldb::user_id_t m_module_id;
-
-  /// Mostly for debuggability.
-  lldb::user_id_t m_die_id;
+  /// Name to use when searching for the function symbol in
+  /// \c module_id. For most function calls this will be a
+  /// mangled name. In cases where a mangled name can't be used,
+  /// this will be the function name.
+  llvm::StringRef lookup_name;
+
+  /// Unique identifier of the lldb_private::Module
+  /// which contains the symbol identified by \c symbol_id.
+  lldb::user_id_t module_id;
+
+  /// Unique identifier of the function symbol on which to
+  /// perform the function call. For example, for DWARF this would
+  /// be the DIE UID.
+  lldb::user_id_t symbol_id;
 };
 
 /// LLDB attaches this prefix to mangled names of functions that it get called

lldb/source/Expression/IRExecutionUnit.cpp

@@ -809,11 +809,11 @@ ResolveFunctionCallLabel(llvm::StringRef name,
 
   const auto &label = *label_or_err;
 
-  auto module_sp = sc.target_sp->GetImages().FindModule(label.m_module_id);
+  auto module_sp = sc.target_sp->GetImages().FindModule(label.module_id);
 
   if (!module_sp)
     return llvm::createStringError(
-        llvm::formatv("failed to find module by UID {0}", label.m_module_id));
+        llvm::formatv("failed to find module by UID {0}", label.module_id));
 
   auto *symbol_file = module_sp->GetSymbolFile();
   if (!symbol_file)
@@ -822,7 +822,7 @@ ResolveFunctionCallLabel(llvm::StringRef name,
 
   SymbolContextList sc_list;
   if (auto err =
-          symbol_file->FindAndResolveFunction(sc_list, label.m_lookup_name))
+          symbol_file->FindAndResolveFunction(sc_list, label.lookup_name))
     return llvm::joinErrors(
         llvm::createStringError("failed to resolve function by UID"),
         std::move(err));

lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp

@@ -9783,8 +9783,6 @@ void TypeSystemClang::LogCreation() const {
              &getASTContext(), getDisplayName());
 }
 
-// Expected format is:
-// $__lldb_func:<mangled name>:<module id>:<definition/declaration DIE id>
 llvm::Expected<llvm::SmallVector<llvm::StringRef, 3>>
 TypeSystemClang::splitFunctionCallLabel(llvm::StringRef label) const {
   if (!label.consume_front(FunctionCallLabelPrefix))
@@ -9827,6 +9825,6 @@ TypeSystemClang::makeFunctionCallLabel(llvm::StringRef label) const {
     return llvm::createStringError(
         llvm::formatv("failed to parse DIE ID from '{0}'.", components[2]));
 
-  return FunctionCallLabel{/*.m_lookup_name =*/components[0],
-                           /*.m_module_id =*/module_id, /*.m_die_id =*/die_id};
+  return FunctionCallLabel{/*.lookup_name=*/components[0],
+                           /*.module_id=*/module_id, /*.symbol_id=*/die_id};
 }