fixup! SymbolContextList -> SymbolContext

Author: Michael137

lldb/include/lldb/Symbol/SymbolFile.h

@@ -332,15 +332,12 @@ class SymbolFile : public PluginInterface {
   /// Resolves the function corresponding to the specified LLDB function
   /// call \c label.
   ///
-  /// \param[in,out] sc_list The resolved functions will be appended to this
-  /// list.
-  ///
   /// \param[in] label The FunctionCallLabel to be resolved.
   ///
   /// \returns An llvm::Error if the specified \c label couldn't be resolved.
-  ///          Returns \c llvm::ErrorSuccess otherwise.
-  virtual llvm::Error ResolveFunctionCallLabel(SymbolContextList &sc_list,
-                                               const FunctionCallLabel &label) {
+  ///          Returns the resolved function (as a SymbolContext) otherwise.
+  virtual llvm::Expected<SymbolContext>
+  ResolveFunctionCallLabel(const FunctionCallLabel &label) {
     return llvm::createStringError("Not implemented");
   }
 

lldb/source/Expression/IRExecutionUnit.cpp

@@ -825,11 +825,14 @@ ResolveFunctionCallLabel(const FunctionCallLabel &label,
     return llvm::createStringError(
         llvm::formatv("no SymbolFile found on module {0:x}.", module_sp.get()));
 
-  SymbolContextList sc_list;
-  if (auto err = symbol_file->ResolveFunctionCallLabel(sc_list, label))
+  auto sc_or_err = symbol_file->ResolveFunctionCallLabel(label);
+  if (!sc_or_err)
     return llvm::joinErrors(
         llvm::createStringError("failed to resolve function by UID"),
-        std::move(err));
+        sc_or_err.takeError());
+
+  SymbolContextList sc_list;
+  sc_list.Append(*sc_or_err);
 
   LoadAddressResolver resolver(*sc.target_sp, symbol_was_missing_weak);
   return resolver.Resolve(sc_list).value_or(LLDB_INVALID_ADDRESS);

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

@@ -2471,9 +2471,8 @@ bool SymbolFileDWARF::ResolveFunction(const DWARFDIE &orig_die,
   return false;
 }
 
-llvm::Error
-SymbolFileDWARF::ResolveFunctionCallLabel(SymbolContextList &sc_list,
-                                          const FunctionCallLabel &label) {
+llvm::Expected<SymbolContext>
+SymbolFileDWARF::ResolveFunctionCallLabel(const FunctionCallLabel &label) {
   std::lock_guard<std::recursive_mutex> guard(GetModuleMutex());
 
   DWARFDIE die = GetDIE(label.symbol_id);
@@ -2507,6 +2506,7 @@ SymbolFileDWARF::ResolveFunctionCallLabel(SymbolContextList &sc_list,
           llvm::formatv("failed to find definition DIE for {0}", label));
   }
 
+  SymbolContextList sc_list;
   if (!ResolveFunction(die, /*include_inlines=*/false, sc_list))
     return llvm::createStringError(
         llvm::formatv("failed to resolve function for {0}", label));
@@ -2515,12 +2515,9 @@ SymbolFileDWARF::ResolveFunctionCallLabel(SymbolContextList &sc_list,
     return llvm::createStringError(
         llvm::formatv("failed to find function for {0}", label));
 
-  if (sc_list.GetSize() > 1)
-    return llvm::createStringError(
-        llvm::formatv("found {0} functions for {1} but expected only 1",
-                      sc_list.GetSize(), label));
+  assert(sc_list.GetSize() == 1);
 
-  return llvm::Error::success();
+  return sc_list[0];
 }
 
 bool SymbolFileDWARF::DIEInDeclContext(const CompilerDeclContext &decl_ctx,

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h

@@ -434,8 +434,8 @@ class SymbolFileDWARF : public SymbolFileCommon {
   DIEArray MergeBlockAbstractParameters(const DWARFDIE &block_die,
                                         DIEArray &&variable_dies);
 
-  llvm::Error ResolveFunctionCallLabel(SymbolContextList &sc_list,
-                                       const FunctionCallLabel &label) override;
+  llvm::Expected<SymbolContext>
+  ResolveFunctionCallLabel(const FunctionCallLabel &label) override;
 
   // Given a die_offset, figure out the symbol context representing that die.
   bool ResolveFunction(const DWARFDIE &die, bool include_inlines,

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

@@ -1603,13 +1603,13 @@ void SymbolFileDWARFDebugMap::GetCompileOptions(
   });
 }
 
-llvm::Error SymbolFileDWARFDebugMap::ResolveFunctionCallLabel(
-    SymbolContextList &sc_list, const FunctionCallLabel &label) {
+llvm::Expected<SymbolContext> SymbolFileDWARFDebugMap::ResolveFunctionCallLabel(
+    const FunctionCallLabel &label) {
   const uint64_t oso_idx = GetOSOIndexFromUserID(label.symbol_id);
   SymbolFileDWARF *oso_dwarf = GetSymbolFileByOSOIndex(oso_idx);
   if (!oso_dwarf)
     return llvm::createStringError(llvm::formatv(
         "couldn't find symbol file for {0} in debug-map.", label));
 
-  return oso_dwarf->ResolveFunctionCallLabel(sc_list, label);
+  return oso_dwarf->ResolveFunctionCallLabel(label);
 }

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h

@@ -144,8 +144,8 @@ class SymbolFileDWARFDebugMap : public SymbolFileCommon {
   void
   GetCompileOptions(std::unordered_map<lldb::CompUnitSP, Args> &args) override;
 
-  llvm::Error ResolveFunctionCallLabel(SymbolContextList &sc_list,
-                                       const FunctionCallLabel &label) override;
+  llvm::Expected<SymbolContext>
+  ResolveFunctionCallLabel(const FunctionCallLabel &label) override;
 
 protected:
   enum { kHaveInitializedOSOs = (1 << 0), kNumFlags };