From d8de2391eb014fb3f750f4c38abc101edc1e2cc2 Mon Sep 17 00:00:00 2001 From: Shubham Sandeep Rastogi Date: Mon, 14 Oct 2024 15:25:52 -0700 Subject: Revert "[lldb] Improve unwinding for discontinuous functions (#111409)" This reverts commit a89e01634fe2e6ce0b967ead24280b6693b523dc. This is being reverted because it broke the test: Unwind/trap_frame_sym_ctx.test /Users/ec2-user/jenkins/workspace/llvm.org/lldb-cmake/llvm-project/lldb/test/Shell/Unwind/trap_frame_sym_ctx.test:21:10: error: CHECK: expected string not found in input CHECK: frame #2: {{.*}}`main --- lldb/source/Commands/CommandObjectTarget.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lldb/source/Commands/CommandObjectTarget.cpp') diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp index 9a4a17e..e950fb3 100644 --- a/lldb/source/Commands/CommandObjectTarget.cpp +++ b/lldb/source/Commands/CommandObjectTarget.cpp @@ -3583,12 +3583,10 @@ protected: addr_t start_addr = range.GetBaseAddress().GetLoadAddress(target); if (abi) start_addr = abi->FixCodeAddress(start_addr); - range.GetBaseAddress().SetLoadAddress(start_addr, target); FuncUnwindersSP func_unwinders_sp( sc.module_sp->GetUnwindTable() - .GetUncachedFuncUnwindersContainingAddress(range.GetBaseAddress(), - sc)); + .GetUncachedFuncUnwindersContainingAddress(start_addr, sc)); if (!func_unwinders_sp) continue; -- cgit v1.1