Add GetRangeContainingLoadAddress

Author: labath

lldb/include/lldb/Symbol/Function.h

@@ -454,6 +454,11 @@ class Function : public UserID, public SymbolContextScope {
   /// and variables).
   const Address &GetAddress() const { return m_address; }
 
+  bool GetRangeContainingLoadAddress(lldb::addr_t load_addr, Target &target,
+                                     AddressRange &range) {
+    return m_block.GetRangeContainingLoadAddress(load_addr, target, range);
+  }
+
   lldb::LanguageType GetLanguage() const;
   /// Find the file and line number of the source location of the start of the
   /// function.  This will use the declaration if present and fall back on the

lldb/source/API/SBThread.cpp

@@ -841,9 +841,6 @@ SBError SBThread::StepOverUntil(lldb::SBFrame &sb_frame,
     // function, and then if there are no addresses remaining, give an
     // appropriate error message.
 
-    // Function block range information is valid even without parsing the entire
-    // block.
-    Block &fun_block = frame_sc.function->GetBlock(/*can_create=*/false);
     bool all_in_function = true;
 
     std::vector<addr_t> step_over_until_addrs;
@@ -862,8 +859,8 @@ SBError SBThread::StepOverUntil(lldb::SBFrame &sb_frame,
           sc.line_entry.range.GetBaseAddress().GetLoadAddress(target);
       if (step_addr != LLDB_INVALID_ADDRESS) {
         AddressRange unused_range;
-        if (fun_block.GetRangeContainingLoadAddress(step_addr, *target,
-                                                    unused_range))
+        if (frame_sc.function->GetRangeContainingLoadAddress(step_addr, *target,
+                                                             unused_range))
           step_over_until_addrs.push_back(step_addr);
         else
           all_in_function = false;