https://github.com/googlewalt updated https://github.com/llvm/llvm-project/pull/169232
>From 2106ee9d3522d68e6537c5d3354bdcd43eea17cf Mon Sep 17 00:00:00 2001 From: Walter Lee <[email protected]> Date: Sun, 23 Nov 2025 14:29:36 -0500 Subject: [PATCH 1/4] Fix r598213 --- lldb/unittests/Expression/DWARFExpressionTest.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lldb/unittests/Expression/DWARFExpressionTest.cpp b/lldb/unittests/Expression/DWARFExpressionTest.cpp index 57669413ea7f0..b2af8a6b87051 100644 --- a/lldb/unittests/Expression/DWARFExpressionTest.cpp +++ b/lldb/unittests/Expression/DWARFExpressionTest.cpp @@ -68,11 +68,13 @@ class MockMemory { MockMemory() = default; MockMemory(Map memory) : m_memory(std::move(memory)) { // Make sure the requested memory size matches the returned value. +#ifndef NDEBUG for (auto &kv : m_memory) { auto &req = kv.first; auto &bytes = kv.second; assert(bytes.size() == req.size); } +#endif } llvm::Expected<std::vector<uint8_t>> ReadMemory(lldb::addr_t addr, >From ab293789b089c988cba5da55279d99f0d7e7253c Mon Sep 17 00:00:00 2001 From: Walter Lee <[email protected]> Date: Sun, 23 Nov 2025 15:20:49 -0500 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: Aiden Grossman <[email protected]> --- lldb/unittests/Expression/DWARFExpressionTest.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lldb/unittests/Expression/DWARFExpressionTest.cpp b/lldb/unittests/Expression/DWARFExpressionTest.cpp index b2af8a6b87051..0d36ea97fd6e9 100644 --- a/lldb/unittests/Expression/DWARFExpressionTest.cpp +++ b/lldb/unittests/Expression/DWARFExpressionTest.cpp @@ -68,13 +68,9 @@ class MockMemory { MockMemory() = default; MockMemory(Map memory) : m_memory(std::move(memory)) { // Make sure the requested memory size matches the returned value. -#ifndef NDEBUG - for (auto &kv : m_memory) { - auto &req = kv.first; - auto &bytes = kv.second; - assert(bytes.size() == req.size); + for ([[maybe_unused]] auto [&req, &byes] : m_memory) { + assert(bytes.size() == req.size); } -#endif } llvm::Expected<std::vector<uint8_t>> ReadMemory(lldb::addr_t addr, >From 9a2e189b2aa9e03da8cc510baa53c8ff0e56f496 Mon Sep 17 00:00:00 2001 From: Walter Lee <[email protected]> Date: Sun, 23 Nov 2025 15:23:52 -0500 Subject: [PATCH 3/4] Fix formatting --- lldb/unittests/Expression/DWARFExpressionTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lldb/unittests/Expression/DWARFExpressionTest.cpp b/lldb/unittests/Expression/DWARFExpressionTest.cpp index 0d36ea97fd6e9..f2bb3995b841a 100644 --- a/lldb/unittests/Expression/DWARFExpressionTest.cpp +++ b/lldb/unittests/Expression/DWARFExpressionTest.cpp @@ -69,7 +69,7 @@ class MockMemory { MockMemory(Map memory) : m_memory(std::move(memory)) { // Make sure the requested memory size matches the returned value. for ([[maybe_unused]] auto [&req, &byes] : m_memory) { - assert(bytes.size() == req.size); + assert(bytes.size() == req.size); } } >From 37d70983977162f44f46949b3d225cb285f49aef Mon Sep 17 00:00:00 2001 From: Walter Lee <[email protected]> Date: Sun, 23 Nov 2025 15:49:14 -0500 Subject: [PATCH 4/4] Fix broken code --- lldb/unittests/Expression/DWARFExpressionTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lldb/unittests/Expression/DWARFExpressionTest.cpp b/lldb/unittests/Expression/DWARFExpressionTest.cpp index f2bb3995b841a..57d5322ec77e4 100644 --- a/lldb/unittests/Expression/DWARFExpressionTest.cpp +++ b/lldb/unittests/Expression/DWARFExpressionTest.cpp @@ -68,7 +68,7 @@ class MockMemory { MockMemory() = default; MockMemory(Map memory) : m_memory(std::move(memory)) { // Make sure the requested memory size matches the returned value. - for ([[maybe_unused]] auto [&req, &byes] : m_memory) { + for ([[maybe_unused]] auto &[req, byes] : m_memory) { assert(bytes.size() == req.size); } } _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
