@@ -1338,25 +1338,25 @@ bool x86AssemblyInspectionEngine::AugmentUnwindPlanFromCallSite(
1338
1338
if (unwind_plan.GetRowCount () < 2 )
1339
1339
return false ;
1340
1340
1341
- const UnwindPlan::Row * first_row = unwind_plan.GetRowAtIndex (0 );
1342
- if (first_row-> GetOffset () != 0 )
1341
+ UnwindPlan::Row first_row = * unwind_plan.GetRowAtIndex (0 );
1342
+ if (first_row. GetOffset () != 0 )
1343
1343
return false ;
1344
- uint32_t cfa_reg = first_row-> GetCFAValue ().GetRegisterNumber ();
1344
+ uint32_t cfa_reg = first_row. GetCFAValue ().GetRegisterNumber ();
1345
1345
if (unwind_plan.GetRegisterKind () != eRegisterKindLLDB) {
1346
1346
cfa_reg = reg_ctx->ConvertRegisterKindToRegisterNumber (
1347
1347
unwind_plan.GetRegisterKind (),
1348
- first_row-> GetCFAValue ().GetRegisterNumber ());
1348
+ first_row. GetCFAValue ().GetRegisterNumber ());
1349
1349
}
1350
1350
if (cfa_reg != m_lldb_sp_regnum ||
1351
- first_row-> GetCFAValue ().GetOffset () != m_wordsize)
1351
+ first_row. GetCFAValue ().GetOffset () != m_wordsize)
1352
1352
return false ;
1353
1353
1354
- const UnwindPlan::Row * original_last_row = unwind_plan.GetLastRow ();
1354
+ UnwindPlan::Row original_last_row = * unwind_plan.GetLastRow ();
1355
1355
1356
1356
size_t offset = 0 ;
1357
1357
int row_id = 1 ;
1358
1358
bool unwind_plan_updated = false ;
1359
- UnwindPlan::Row row = * first_row;
1359
+ UnwindPlan::Row row = first_row;
1360
1360
1361
1361
// After a mid-function epilogue we will need to re-insert the original
1362
1362
// unwind rules so unwinds work for the remainder of the function. These
@@ -1380,7 +1380,7 @@ bool x86AssemblyInspectionEngine::AugmentUnwindPlanFromCallSite(
1380
1380
continue ;
1381
1381
1382
1382
if (reinstate_unwind_state) {
1383
- row = * original_last_row;
1383
+ row = original_last_row;
1384
1384
row.SetOffset (offset);
1385
1385
unwind_plan.AppendRow (row);
1386
1386
reinstate_unwind_state = false ;
@@ -1521,7 +1521,7 @@ bool x86AssemblyInspectionEngine::AugmentUnwindPlanFromCallSite(
1521
1521
if (ret_pattern_p ()) {
1522
1522
row.SetOffset (offset);
1523
1523
row.GetCFAValue ().SetIsRegisterPlusOffset (
1524
- first_row-> GetCFAValue ().GetRegisterNumber (), m_wordsize);
1524
+ first_row. GetCFAValue ().GetRegisterNumber (), m_wordsize);
1525
1525
1526
1526
unwind_plan.InsertRow (row);
1527
1527
unwind_plan_updated = true ;
0 commit comments