Author: Jonas Devlieghere Date: 2023-05-02T11:09:53-07:00 New Revision: 30c1f31274e5abb535387940af2337c2e4fcc8a7
URL: https://github.com/llvm/llvm-project/commit/30c1f31274e5abb535387940af2337c2e4fcc8a7 DIFF: https://github.com/llvm/llvm-project/commit/30c1f31274e5abb535387940af2337c2e4fcc8a7.diff LOG: [lldb] Fix 8be139fc1251 for propery value changes Fix 8be139fc1251 for mid-air collision with the propery value changes. Added: Modified: lldb/source/Target/Target.cpp Removed: ################################################################################ diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index 9d4581d4ffd4..74ab4ea373d8 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -4588,20 +4588,20 @@ uint64_t TargetProperties::GetExprErrorLimit() const { uint64_t TargetProperties::GetExprAllocAddress() const { const uint32_t idx = ePropertyExprAllocAddress; - return m_collection_sp->GetPropertyAtIndexAsUInt64( - nullptr, idx, g_target_properties[idx].default_uint_value); + return m_collection_sp->GetPropertyAtIndexAsUInt64(idx).value_or( + g_target_properties[idx].default_uint_value); } uint64_t TargetProperties::GetExprAllocSize() const { const uint32_t idx = ePropertyExprAllocSize; - return m_collection_sp->GetPropertyAtIndexAsUInt64( - nullptr, idx, g_target_properties[idx].default_uint_value); + return m_collection_sp->GetPropertyAtIndexAsUInt64(idx).value_or( + g_target_properties[idx].default_uint_value); } uint64_t TargetProperties::GetExprAllocAlign() const { const uint32_t idx = ePropertyExprAllocAlign; - return m_collection_sp->GetPropertyAtIndexAsUInt64( - nullptr, idx, g_target_properties[idx].default_uint_value); + return m_collection_sp->GetPropertyAtIndexAsUInt64(idx).value_or( + g_target_properties[idx].default_uint_value); } bool TargetProperties::GetBreakpointsConsultPlatformAvoidList() { _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
