llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-backend-hexagon Author: Pavel Labath (labath) <details> <summary>Changes</summary> This is the mechanical part of #<!-- -->131150. I'm also removing the interfaces taking a RowSP. --- Patch is 46.65 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/132008.diff 25 Files Affected: - (modified) lldb/include/lldb/Symbol/UnwindPlan.h (+2-6) - (modified) lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp (+10-11) - (modified) lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp (+9-10) - (modified) lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp (+4-4) - (modified) lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp (+10-11) - (modified) lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp (+10-11) - (modified) lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp (+12-13) - (modified) lldb/source/Plugins/ABI/LoongArch/ABISysV_loongarch.cpp (+9-10) - (modified) lldb/source/Plugins/ABI/MSP430/ABISysV_msp430.cpp (+11-11) - (modified) lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp (+9-9) - (modified) lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp (+9-9) - (modified) lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp (+10-10) - (modified) lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp (+11-11) - (modified) lldb/source/Plugins/ABI/RISCV/ABISysV_riscv.cpp (+9-10) - (modified) lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp (+4-4) - (modified) lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp (+12-13) - (modified) lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp (+12-13) - (modified) lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp (+13-13) - (modified) lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp (+13-13) - (modified) lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp (+3-3) - (modified) lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp (+5-5) - (modified) lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp (+4-4) - (modified) lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp (+5-5) - (modified) lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp (+3-3) - (modified) lldb/source/Symbol/UnwindPlan.cpp (+9-12) ``````````diff diff --git a/lldb/include/lldb/Symbol/UnwindPlan.h b/lldb/include/lldb/Symbol/UnwindPlan.h index e4199d5677035..7c361bc08bcfe 100644 --- a/lldb/include/lldb/Symbol/UnwindPlan.h +++ b/lldb/include/lldb/Symbol/UnwindPlan.h @@ -462,13 +462,9 @@ class UnwindPlan { void Dump(Stream &s, Thread *thread, lldb::addr_t base_addr) const; - void AppendRow(const RowSP &row_sp); - void AppendRow(Row row) { AppendRow(std::make_shared<Row>(std::move(row))); } + void AppendRow(Row row); - void InsertRow(const RowSP &row_sp, bool replace_existing = false); - void InsertRow(Row row, bool replace_existing = false) { - InsertRow(std::make_shared<Row>(std::move(row)), replace_existing); - } + void InsertRow(Row row, bool replace_existing = false); // Returns a pointer to the best row for the given offset into the function's // instructions. If offset is -1 it indicates that the function start is diff --git a/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp index 4b3018bb40a49..f86ab8cbb1195 100644 --- a/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp +++ b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp @@ -349,16 +349,16 @@ UnwindPlanSP ABIMacOSX_arm64::CreateFunctionEntryUnwindPlan() { uint32_t sp_reg_num = arm64_dwarf::sp; uint32_t pc_reg_num = arm64_dwarf::pc; - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; // Our previous Call Frame Address is the stack pointer - row->GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 0); + row.GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 0); // Our previous PC is in the LR, all other registers are the same. - row->SetRegisterLocationToRegister(pc_reg_num, lr_reg_num, true); + row.SetRegisterLocationToRegister(pc_reg_num, lr_reg_num, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("arm64 at-func-entry default"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); return plan_sp; @@ -368,18 +368,17 @@ UnwindPlanSP ABIMacOSX_arm64::CreateDefaultUnwindPlan() { uint32_t fp_reg_num = arm64_dwarf::fp; uint32_t pc_reg_num = arm64_dwarf::pc; - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; const int32_t ptr_size = 8; - row->GetCFAValue().SetIsRegisterPlusOffset(fp_reg_num, 2 * ptr_size); - row->SetOffset(0); - row->SetUnspecifiedRegistersAreUndefined(true); + row.GetCFAValue().SetIsRegisterPlusOffset(fp_reg_num, 2 * ptr_size); + row.SetUnspecifiedRegistersAreUndefined(true); - row->SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, ptr_size * -2, true); - row->SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, ptr_size * -1, true); + row.SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, ptr_size * -2, true); + row.SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, ptr_size * -1, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("arm64-apple-darwin default unwind plan"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); plan_sp->SetUnwindPlanValidAtAllInstructions(eLazyBoolNo); diff --git a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp index ca794cd604fb1..6e07c0982be0e 100644 --- a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp +++ b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp @@ -389,14 +389,14 @@ UnwindPlanSP ABISysV_arm64::CreateFunctionEntryUnwindPlan() { uint32_t lr_reg_num = arm64_dwarf::lr; uint32_t sp_reg_num = arm64_dwarf::sp; - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; // Our previous Call Frame Address is the stack pointer, all other registers // are the same. - row->GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 0); + row.GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 0); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetReturnAddressRegister(lr_reg_num); plan_sp->SetSourceName("arm64 at-func-entry default"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); @@ -409,18 +409,17 @@ UnwindPlanSP ABISysV_arm64::CreateDefaultUnwindPlan() { uint32_t fp_reg_num = arm64_dwarf::fp; uint32_t pc_reg_num = arm64_dwarf::pc; - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; const int32_t ptr_size = 8; - row->GetCFAValue().SetIsRegisterPlusOffset(fp_reg_num, 2 * ptr_size); - row->SetOffset(0); - row->SetUnspecifiedRegistersAreUndefined(true); + row.GetCFAValue().SetIsRegisterPlusOffset(fp_reg_num, 2 * ptr_size); + row.SetUnspecifiedRegistersAreUndefined(true); - row->SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, ptr_size * -2, true); - row->SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, ptr_size * -1, true); + row.SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, ptr_size * -2, true); + row.SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, ptr_size * -1, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("arm64 default unwind plan"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); plan_sp->SetUnwindPlanValidAtAllInstructions(eLazyBoolNo); diff --git a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp index 21bc0f28db0b9..f9c249d7fec1c 100644 --- a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp +++ b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp @@ -560,16 +560,16 @@ ValueObjectSP ABISysV_arc::GetReturnValueObjectImpl(Thread &thread, } UnwindPlanSP ABISysV_arc::CreateFunctionEntryUnwindPlan() { - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; // Our Call Frame Address is the stack pointer value. - row->GetCFAValue().SetIsRegisterPlusOffset(dwarf::sp, 0); + row.GetCFAValue().SetIsRegisterPlusOffset(dwarf::sp, 0); // The previous PC is in the BLINK, all other registers are the same. - row->SetRegisterLocationToRegister(dwarf::pc, dwarf::blink, true); + row.SetRegisterLocationToRegister(dwarf::pc, dwarf::blink, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("arc at-func-entry default"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); return plan_sp; diff --git a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp index 27d0474cc9d19..5b5f6facc924c 100644 --- a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp +++ b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp @@ -1788,16 +1788,16 @@ UnwindPlanSP ABIMacOSX_arm::CreateFunctionEntryUnwindPlan() { uint32_t sp_reg_num = dwarf_sp; uint32_t pc_reg_num = dwarf_pc; - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; // Our Call Frame Address is the stack pointer value - row->GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 0); + row.GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 0); // The previous PC is in the LR, all other registers are the same. - row->SetRegisterLocationToRegister(pc_reg_num, lr_reg_num, true); + row.SetRegisterLocationToRegister(pc_reg_num, lr_reg_num, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("arm at-func-entry default"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); return plan_sp; @@ -1808,18 +1808,17 @@ UnwindPlanSP ABIMacOSX_arm::CreateDefaultUnwindPlan() { dwarf_r7; // apple uses r7 for all frames. Normal arm uses r11 uint32_t pc_reg_num = dwarf_pc; - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; const int32_t ptr_size = 4; - row->GetCFAValue().SetIsRegisterPlusOffset(fp_reg_num, 2 * ptr_size); - row->SetOffset(0); - row->SetUnspecifiedRegistersAreUndefined(true); + row.GetCFAValue().SetIsRegisterPlusOffset(fp_reg_num, 2 * ptr_size); + row.SetUnspecifiedRegistersAreUndefined(true); - row->SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, ptr_size * -2, true); - row->SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, ptr_size * -1, true); + row.SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, ptr_size * -2, true); + row.SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, ptr_size * -1, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("arm-apple-ios default unwind plan"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); plan_sp->SetUnwindPlanValidAtAllInstructions(eLazyBoolNo); diff --git a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp index cf051b48e3fc1..2bcb2c0de97ac 100644 --- a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp +++ b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp @@ -1905,15 +1905,15 @@ UnwindPlanSP ABISysV_arm::CreateFunctionEntryUnwindPlan() { uint32_t sp_reg_num = dwarf_sp; uint32_t pc_reg_num = dwarf_pc; - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; // Our Call Frame Address is the stack pointer value - row->GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 0); + row.GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 0); // The previous PC is in the LR, all other registers are the same. - row->SetRegisterLocationToRegister(pc_reg_num, lr_reg_num, true); + row.SetRegisterLocationToRegister(pc_reg_num, lr_reg_num, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("arm at-func-entry default"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); return plan_sp; @@ -1924,18 +1924,17 @@ UnwindPlanSP ABISysV_arm::CreateDefaultUnwindPlan() { uint32_t fp_reg_num = dwarf_r11; uint32_t pc_reg_num = dwarf_pc; - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; const int32_t ptr_size = 4; - row->GetCFAValue().SetIsRegisterPlusOffset(fp_reg_num, 2 * ptr_size); - row->SetOffset(0); - row->SetUnspecifiedRegistersAreUndefined(true); + row.GetCFAValue().SetIsRegisterPlusOffset(fp_reg_num, 2 * ptr_size); + row.SetUnspecifiedRegistersAreUndefined(true); - row->SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, ptr_size * -2, true); - row->SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, ptr_size * -1, true); + row.SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, ptr_size * -2, true); + row.SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, ptr_size * -1, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("arm default unwind plan"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); plan_sp->SetUnwindPlanValidAtAllInstructions(eLazyBoolNo); diff --git a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp index 4af9bcb8644f5..2c54a1348ede8 100644 --- a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp +++ b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp @@ -1196,18 +1196,17 @@ ValueObjectSP ABISysV_hexagon::GetReturnValueObjectImpl( // called when we are on the first instruction of a new function for hexagon // the return address is in RA (R31) UnwindPlanSP ABISysV_hexagon::CreateFunctionEntryUnwindPlan() { - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; // Our Call Frame Address is the stack pointer value - row->GetCFAValue().SetIsRegisterPlusOffset(LLDB_REGNUM_GENERIC_SP, 4); - row->SetOffset(0); + row.GetCFAValue().SetIsRegisterPlusOffset(LLDB_REGNUM_GENERIC_SP, 4); // The previous PC is in the LR - row->SetRegisterLocationToRegister(LLDB_REGNUM_GENERIC_PC, - LLDB_REGNUM_GENERIC_RA, true); + row.SetRegisterLocationToRegister(LLDB_REGNUM_GENERIC_PC, + LLDB_REGNUM_GENERIC_RA, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindGeneric); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetReturnAddressRegister(LLDB_REGNUM_GENERIC_RA); plan_sp->SetSourceName("hexagon at-func-entry default"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); @@ -1219,17 +1218,17 @@ UnwindPlanSP ABISysV_hexagon::CreateDefaultUnwindPlan() { uint32_t sp_reg_num = LLDB_REGNUM_GENERIC_SP; uint32_t pc_reg_num = LLDB_REGNUM_GENERIC_PC; - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; - row->SetUnspecifiedRegistersAreUndefined(true); - row->GetCFAValue().SetIsRegisterPlusOffset(LLDB_REGNUM_GENERIC_FP, 8); + row.SetUnspecifiedRegistersAreUndefined(true); + row.GetCFAValue().SetIsRegisterPlusOffset(LLDB_REGNUM_GENERIC_FP, 8); - row->SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, -8, true); - row->SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, -4, true); - row->SetRegisterLocationToIsCFAPlusOffset(sp_reg_num, 0, true); + row.SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, -8, true); + row.SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, -4, true); + row.SetRegisterLocationToIsCFAPlusOffset(sp_reg_num, 0, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindGeneric); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("hexagon default unwind plan"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); plan_sp->SetUnwindPlanValidAtAllInstructions(eLazyBoolNo); diff --git a/lldb/source/Plugins/ABI/LoongArch/ABISysV_loongarch.cpp b/lldb/source/Plugins/ABI/LoongArch/ABISysV_loongarch.cpp index 14ef8a0177aac..e6c8c8b469873 100644 --- a/lldb/source/Plugins/ABI/LoongArch/ABISysV_loongarch.cpp +++ b/lldb/source/Plugins/ABI/LoongArch/ABISysV_loongarch.cpp @@ -539,16 +539,16 @@ UnwindPlanSP ABISysV_loongarch::CreateFunctionEntryUnwindPlan() { uint32_t sp_reg_num = loongarch_dwarf::dwarf_gpr_sp; uint32_t ra_reg_num = loongarch_dwarf::dwarf_gpr_ra; - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; // Define CFA as the stack pointer - row->GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 0); + row.GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 0); // Previous frame's pc is in ra - row->SetRegisterLocationToRegister(pc_reg_num, ra_reg_num, true); + row.SetRegisterLocationToRegister(pc_reg_num, ra_reg_num, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("loongarch function-entry unwind plan"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); return plan_sp; @@ -558,11 +558,10 @@ UnwindPlanSP ABISysV_loongarch::CreateDefaultUnwindPlan() { uint32_t pc_reg_num = LLDB_REGNUM_GENERIC_PC; uint32_t fp_reg_num = LLDB_REGNUM_GENERIC_FP; - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; // Define the CFA as the current frame pointer value. - row->GetCFAValue().SetIsRegisterPlusOffset(fp_reg_num, 0); - row->SetOffset(0); + row.GetCFAValue().SetIsRegisterPlusOffset(fp_reg_num, 0); int reg_size = 4; if (m_is_la64) @@ -570,11 +569,11 @@ UnwindPlanSP ABISysV_loongarch::CreateDefaultUnwindPlan() { // Assume the ra reg (return pc) and caller's frame pointer // have been spilled to stack already. - row->SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, reg_size * -2, true); - row->SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, reg_size * -1, true); + row.SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, reg_size * -2, true); + row.SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, reg_size * -1, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindGeneric); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("loongarch default unwind plan"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); plan_sp->SetUnwindPlanValidAtAllInstructions(eLazyBoolNo); diff --git a/lldb/source/Plugins/ABI/MSP430/ABISysV_msp430.cpp b/lldb/source/Plugins/ABI/MSP430/ABISysV_msp430.cpp index 2cc1bbbcef11b..af7ef03b94c4c 100644 --- a/lldb/source/Plugins/ABI/MSP430/ABISysV_msp430.cpp +++ b/lldb/source/Plugins/ABI/MSP430/ABISysV_msp430.cpp @@ -309,13 +309,13 @@ UnwindPlanSP ABISysV_msp430::CreateFunctionEntryUnwindPlan() { uint32_t sp_reg_num = dwarf_sp; uint32_t pc_reg_num = dwarf_pc; - UnwindPlan::RowSP row(new UnwindPlan::Row); - row->GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 2); - row->SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, -2, true); - row->SetRegisterLocationToIsCFAPlusOffset(sp_reg_num, 0, true); + UnwindPlan::Row row; + row.GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 2); + row.SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, -2, true); + row.SetRegisterLocationToIsCFAPlusOffset(sp_reg_num, 0, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("msp430 at-func-entry default"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); return plan_sp; @@ -326,14 +326,14 @@ UnwindPlanSP ABISysV_msp430::CreateDefaultUnwindPlan() { uint32_t sp_reg_num = dwarf_sp; uint32_t pc_reg_num = dwarf_pc; - UnwindPlan::RowSP row(new UnwindPlan::Row); - row->GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 2); - row->SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, -2, true); - row->SetRegisterLocationToIsCFAPlusOffset(sp_reg_num, 0, true); - row->SetRegisterLocationToUnspecified(fp_reg_num, true); + UnwindPlan::Row row; + row.GetCFAValue().SetIsRegisterPlusOffset(sp_reg_num, 2); + row.SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, -2, true); + row.SetRegisterLocationToIsCFAPlusOffset(sp_reg_num, 0, true); + row.SetRegisterLocationToUnspecified(fp_reg_num, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("msp430 default unwind plan"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); plan_sp->SetUnwindPlanValidAtAllInstructions(eLazyBoolNo); diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp index a2b60a07e9ca2..dd91a05534e37 100644 --- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp +++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp @@ -956,16 +956,16 @@ ValueObjectSP ABISysV_mips::GetReturnValueObjectImpl( } UnwindPlanSP ABISysV_mips::CreateFunctionEntryUnwindPlan() { - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; // Our Call Frame Address is the stack pointer value - row->GetCFAValue().SetIsRegisterPlusOffset(dwarf_r29, 0); + row.GetCFAValue().SetIsRegisterPlusOffset(dwarf_r29, 0); // The previous PC is in the RA, all other registers are the same. - row->SetRegisterLocationToRegister(dwarf_pc, dwarf_r31, true); + row.SetRegisterLocationToRegister(dwarf_pc, dwarf_r31, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("mips at-func-entry default"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); plan_sp->SetReturnAddressRegister(dwarf_r31); @@ -973,15 +973,15 @@ UnwindPlanSP ABISysV_mips::CreateFunctionEntryUnwindPlan() { } UnwindPlanSP ABISysV_mips::CreateDefaultUnwindPlan() { - UnwindPlan::RowSP row(new UnwindPlan::Row); + UnwindPlan::Row row; - row->SetUnspecifiedRegistersAreUndefined(true); - row->GetCFAValue().SetIsRegisterPlusOffset(dwarf_r29, 0); + row.SetUnspecifiedRegistersAreUndefined(true); + row.GetCFAValue().SetIsRegisterPlusOffset(dwarf_r29, 0); - row->SetRegisterLocationToRegister(dwarf_pc, dwarf_r31, true); + row.SetRegisterLocationToRegister(dwarf_pc, dwarf_r31, true); auto plan_sp = std::make_shared<UnwindPlan>(eRegisterKindDWARF); - plan_sp->AppendRow(row); + plan_sp->AppendRow(std::move(row)); plan_sp->SetSourceName("mips default unwind plan"); plan_sp->SetSourcedFromCompiler(eLazyBoolNo); plan_sp->SetUnwindPlanValidAtAllI... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/132008 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
