Fix debug mode test failures on MIPS and PPC after f1aa5562.

test/unittests/compiler/move-optimizer-unittest.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/move-optimizer.h"
 #include "test/unittests/compiler/instruction-sequence-unittest.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
@@ skipping 86 matching lines @@
   Optimize();
 
   CHECK_EQ(0, NonRedundantSize(first_instr->parallel_moves()[0]));
   auto move = last_instr->parallel_moves()[0];
   CHECK_EQ(1, NonRedundantSize(move));
   CHECK(Contains(move, Reg(0), Reg(1)));
 }
 
 
 TEST_F(MoveOptimizerTest, RemovesRedundantExplicit) {
+  int first_reg_index =
+      RegisterConfiguration::ArchDefault(RegisterConfiguration::TURBOFAN)
+          ->GetAllocatableGeneralCode(0);
+  int second_reg_index =
+      RegisterConfiguration::ArchDefault(RegisterConfiguration::TURBOFAN)
+          ->GetAllocatableGeneralCode(1);
+
   StartBlock();
   auto first_instr = EmitNop();
-  AddMove(first_instr, Reg(0), ExplicitReg(1));
+  AddMove(first_instr, Reg(first_reg_index), ExplicitReg(second_reg_index));
   auto last_instr = EmitNop();
-  AddMove(last_instr, Reg(1), Reg(0));
+  AddMove(last_instr, Reg(second_reg_index), Reg(first_reg_index));
   EndBlock(Last());
 
   Optimize();
 
   CHECK_EQ(0, NonRedundantSize(first_instr->parallel_moves()[0]));
   auto move = last_instr->parallel_moves()[0];
   CHECK_EQ(1, NonRedundantSize(move));
-  CHECK(Contains(move, Reg(0), ExplicitReg(1)));
+  CHECK(Contains(move, Reg(first_reg_index), ExplicitReg(second_reg_index)));
 }
 
 
 TEST_F(MoveOptimizerTest, SplitsConstants) {
   StartBlock();
   EndBlock(Last());
 
   auto gap = LastInstruction();
   AddMove(gap, Const(1), Slot(0));
   AddMove(gap, Const(1), Slot(1));
@@ skipping 66 matching lines @@
   CHECK(gap_1->AreMovesRedundant());
   auto move = last->parallel_moves()[0];
   CHECK_EQ(2, NonRedundantSize(move));
   CHECK(Contains(move, Reg(0), Reg(1)));
   CHECK(Contains(move, Reg(1), Reg(0)));
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8