[Lldb-commits] [lldb] [lldb] Avoid Function::GetAddressRange in SymbolFileCTF (PR #128517)

Pavel Labath via lldb-commits lldb-commits at lists.llvm.org
Mon Feb 24 06:22:26 PST 2025


https://github.com/labath created https://github.com/llvm/llvm-project/pull/128517

SymbolFileCTF never creates discontinuous functions, so this is technically NFC, but it takes us one step closer to removing the deprecated API.

>From 01ee867cca41202c2a87f8216b75aa5d6d9603cd Mon Sep 17 00:00:00 2001
From: Pavel Labath <pavel at labath.sk>
Date: Mon, 24 Feb 2025 15:20:46 +0100
Subject: [PATCH] [lldb] Avoid Function::GetAddressRange in SymbolFileCTF

SymbolFileCTF never creates discontinuous functions, so this is
technically NFC, but it takes us one step closer to removing the
deprecated API.
---
 lldb/source/Plugins/SymbolFile/CTF/SymbolFileCTF.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lldb/source/Plugins/SymbolFile/CTF/SymbolFileCTF.cpp b/lldb/source/Plugins/SymbolFile/CTF/SymbolFileCTF.cpp
index 0feb927c5c948..0b8862f64ceb8 100644
--- a/lldb/source/Plugins/SymbolFile/CTF/SymbolFileCTF.cpp
+++ b/lldb/source/Plugins/SymbolFile/CTF/SymbolFileCTF.cpp
@@ -946,8 +946,10 @@ uint32_t SymbolFileCTF::ResolveSymbolContext(const Address &so_addr,
   // Resolve functions.
   if (resolve_scope & eSymbolContextFunction) {
     for (FunctionSP function_sp : m_functions) {
-      if (function_sp->GetAddressRange().ContainsFileAddress(
-              so_addr.GetFileAddress())) {
+      if (llvm::any_of(
+              function_sp->GetAddressRanges(), [&](const AddressRange range) {
+                return range.ContainsFileAddress(so_addr.GetFileAddress());
+              })) {
         sc.function = function_sp.get();
         resolved_flags |= eSymbolContextFunction;
         break;



More information about the lldb-commits mailing list