Index: source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp =================================================================== --- source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp +++ source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp @@ -643,22 +643,6 @@ { m_curr_row->SetRegisterLocationToRegister (reg_num, reg_num, must_replace); m_curr_row_modified = true; - - if (reg_info->kinds[eRegisterKindGeneric] == LLDB_REGNUM_GENERIC_RA) - { - // This load was restoring the return address register, - // so this is also how we will unwind the PC... - RegisterInfo pc_reg_info; - if (instruction->GetRegisterInfo (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_PC, pc_reg_info)) - { - uint32_t pc_reg_num = pc_reg_info.kinds[unwind_reg_kind]; - if (pc_reg_num != LLDB_INVALID_REGNUM) - { - m_curr_row->SetRegisterLocationToRegister (pc_reg_num, reg_num, must_replace); - m_curr_row_modified = true; - } - } - } } } break;