================
@@ -131,25 +138,19 @@ UnwindTable::GetFuncUnwindersContainingAddress(const
Address &addr,
// There is an UnwindTable per object file, so we can safely use file handles
addr_t file_addr = addr.GetFileAddress();
- iterator end = m_unwinds.end();
- iterator insert_pos = end;
- if (!m_unwinds.empty()) {
- insert_pos = m_unwinds.lower_bound(file_addr);
- iterator pos = insert_pos;
- if ((pos == m_unwinds.end()) ||
- (pos != m_unwinds.begin() &&
- pos->second->GetFunctionStartAddress() != addr))
- --pos;
-
+ iterator insert_pos = m_unwinds.upper_bound(file_addr);
+ if (insert_pos != m_unwinds.begin()) {
+ auto pos = std::prev(insert_pos);
if (pos->second->ContainsAddress(addr))
return pos->second;
}
+ Address start_addr = GetFunctionOrSymbolAddress(addr, sc);
AddressRanges ranges = GetAddressRanges(addr, sc);
if (ranges.empty())
return nullptr;
- auto func_unwinder_sp = std::make_shared<FuncUnwinders>(*this, addr, ranges);
+ auto func_unwinder_sp = std::make_shared<FuncUnwinders>(*this, start_addr,
ranges);
----------------
labath wrote:
This part makes sure the correct entry point address is passed the the CFI code.
https://github.com/llvm/llvm-project/pull/137006
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
