[lldb] Change SymbolContext::GetAddressRangeFromHereToEndLine to return llvm::Error (NFC)

Signed-off-by: AbdAlRahman Gad <[email protected]>

Author: AbdAlRahmanGad

lldb/include/lldb/Symbol/SymbolContext.h

@@ -201,8 +201,8 @@ class SymbolContext {
   bool GetAddressRange(uint32_t scope, uint32_t range_idx,
                        bool use_inline_block_range, AddressRange &range) const;
 
-  llvm::Expected<bool> GetAddressRangeFromHereToEndLine(uint32_t end_line,
-                                                        AddressRange &range);
+  llvm::Error GetAddressRangeFromHereToEndLine(uint32_t end_line,
+                                               AddressRange &range);
 
   /// Find the best global data symbol visible from this context.
   ///

lldb/source/API/SBThread.cpp

@@ -605,12 +605,9 @@ void SBThread::StepInto(const char *target_name, uint32_t end_line,
     if (end_line == LLDB_INVALID_LINE_NUMBER)
       range = sc.line_entry.range;
     else {
-      auto get_address_range_from_here_to_end_line_or_err =
-          sc.GetAddressRangeFromHereToEndLine(end_line, range);
-      if (!get_address_range_from_here_to_end_line_or_err) {
-        error = Status::FromErrorString(
-            toString(get_address_range_from_here_to_end_line_or_err.takeError())
-                .c_str());
+      llvm::Error err = sc.GetAddressRangeFromHereToEndLine(end_line, range);
+      if (err) {
+        error = Status::FromErrorString(llvm::toString(std::move(err)).c_str());
         return;
       }
     }

lldb/source/Commands/CommandObjectThread.cpp

@@ -489,14 +489,11 @@ class CommandObjectThreadStepWithTypeAndScope : public CommandObjectParsed {
         AddressRange range;
         SymbolContext sc = frame->GetSymbolContext(eSymbolContextEverything);
         if (m_options.m_end_line != LLDB_INVALID_LINE_NUMBER) {
-          auto get_address_range_from_here_to_end_line_or_err =
+          llvm::Error err =
               sc.GetAddressRangeFromHereToEndLine(m_options.m_end_line, range);
-          if (!get_address_range_from_here_to_end_line_or_err) {
-            result.AppendErrorWithFormat(
-                "invalid end-line option: %s.",
-                toString(
-                    get_address_range_from_here_to_end_line_or_err.takeError())
-                    .c_str());
+          if (err) {
+            result.AppendErrorWithFormat("invalid end-line option: %s.",
+                                         llvm::toString(std::move(err)).c_str());
             return;
           }
         } else if (m_options.m_end_line_is_block_end) {

lldb/source/Symbol/SymbolContext.cpp

@@ -706,7 +706,7 @@ LineEntry SymbolContext::GetFunctionStartLineEntry() const {
   return LineEntry();
 }
 
-llvm::Expected<bool>
+llvm::Error
 SymbolContext::GetAddressRangeFromHereToEndLine(uint32_t end_line,
                                                 AddressRange &range) {
   if (!line_entry.IsValid()) {
@@ -763,7 +763,7 @@ SymbolContext::GetAddressRangeFromHereToEndLine(uint32_t end_line,
   lldb::addr_t range_size = end_entry.range.GetBaseAddress().GetFileAddress() -
                             range.GetBaseAddress().GetFileAddress();
   range.SetByteSize(range_size);
-  return true;
+  return llvm::Error::success();
 }
 
 const Symbol *SymbolContext::FindBestGlobalDataSymbol(ConstString name,