Merge pull request #12732 from JosJuice/arm64emitter-assert-category

Arm64Emitter: Fix incorrect assert category (and a shadowed variable)

1 files changed, 9 insertions, 9 deletions

diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp
index f769edc2f3..3831bff96f 100644
--- a/Source/Core/Common/Arm64Emitter.cpp
+++ b/Source/Core/Common/Arm64Emitter.cpp
@@ -1809,16 +1809,16 @@ void ARM64XEmitter::ParallelMoves(RegisterMove* begin, RegisterMove* end,
   {
     bool removed_moves_during_this_loop_iteration = false;
 
-    RegisterMove* move = end;
-    while (move != begin)
+    RegisterMove* current_move = end;
+    while (current_move != begin)
     {
-      RegisterMove* prev_move = move;
-      --move;
-      if ((*source_gpr_usages)[DecodeReg(move->dst)] == 0)
+      RegisterMove* prev_move = current_move;
+      --current_move;
+      if ((*source_gpr_usages)[DecodeReg(current_move->dst)] == 0)
       {
-        MOV(move->dst, move->src);
-        (*source_gpr_usages)[DecodeReg(move->src)]--;
-        std::move(prev_move, end, move);
+        MOV(current_move->dst, current_move->src);
+        (*source_gpr_usages)[DecodeReg(current_move->src)]--;
+        std::move(prev_move, end, current_move);
         --end;
         removed_moves_during_this_loop_iteration = true;
       }
@@ -1832,7 +1832,7 @@ void ARM64XEmitter::ParallelMoves(RegisterMove* begin, RegisterMove* end,
       while ((*source_gpr_usages)[temp_reg] != 0)
       {
         ++temp_reg;
-        ASSERT_MSG(COMMON, temp_reg != temp_reg_end, "Out of registers");
+        ASSERT_MSG(DYNA_REC, temp_reg != temp_reg_end, "Out of registers");
       }
 
       const ARM64Reg src = begin->src;