================ @@ -46,21 +46,27 @@ static bool ShouldDisplayAssemblySource( return false; } -static protocol::Source CreateAssemblySource(const lldb::SBTarget &target, - lldb::SBAddress address) { - protocol::Source source; +std::optional<protocol::Source> CreateAssemblySource( + const lldb::SBTarget &target, lldb::SBAddress address, + llvm::function_ref<int32_t(lldb::addr_t)> create_reference) { - auto symbol = address.GetSymbol(); + lldb::SBSymbol symbol = address.GetSymbol(); + lldb::addr_t load_addr = LLDB_INVALID_ADDRESS; std::string name; if (symbol.IsValid()) { - source.sourceReference = symbol.GetStartAddress().GetLoadAddress(target); + load_addr = symbol.GetStartAddress().GetLoadAddress(target); name = symbol.GetName(); } else { - const auto load_addr = address.GetLoadAddress(target); - source.sourceReference = load_addr; + load_addr = address.GetLoadAddress(target); name = GetLoadAddressString(load_addr); } + if (load_addr == LLDB_INVALID_ADDRESS) { + return std::nullopt; + } ---------------- JDevlieghere wrote:
No braces https://github.com/llvm/llvm-project/pull/144364 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits