From e4235bdf26a2dd3b678daad4581d8e8edbc1aa7b Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Fri, 22 Oct 2021 13:23:06 -0700 Subject: [PATCH] Fix locals naming in DNBArchMachARM64::GetGPRState for 32-bit builds The local variables names used for logging when built on armv7k weren't unique, resulting in build error. rdar://84274006 --- lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp index 69a8333..305eb14 100644 --- a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp +++ b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp @@ -157,9 +157,9 @@ kern_return_t DNBArchMachARM64::GetGPRState(bool force) { uint64_t log_pc = arm_thread_state64_get_pc(m_state.context.gpr); #else uint64_t log_fp = m_state.context.gpr.__fp; - uint64_t log_fp = m_state.context.gpr.__lr; - uint64_t log_fp = m_state.context.gpr.__sp; - uint64_t log_fp = m_state.context.gpr.__pc, + uint64_t log_lr = m_state.context.gpr.__lr; + uint64_t log_sp = m_state.context.gpr.__sp; + uint64_t log_pc = m_state.context.gpr.__pc, #endif DNBLogThreaded( "thread_get_state(0x%4.4x, %u, &gpr, %u) => 0x%8.8x (count = %u) regs" -- 2.7.4