[turbofan] fix vreg mapping for instruction selector tests

test/unittests/compiler/x64/instruction-selector-x64-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 "test/unittests/compiler/instruction-selector-unittest.h"
 
 #include "src/compiler/node-matchers.h"
 
 namespace v8 {
 namespace internal {
@@ skipping 78 matching lines @@
   StreamBuilder m(this, kMachInt32, kMachInt32, kMachInt32);
   Node* param1 = m.Parameter(0);
   Node* param2 = m.Parameter(1);
   Node* add = m.Int32Add(param1, param2);
   m.Return(m.Int32Add(add, param1));
   Stream s = m.Build();
   ASSERT_EQ(2U, s.size());
   EXPECT_EQ(kX64Add32, s[0]->arch_opcode());
   ASSERT_EQ(2U, s[0]->InputCount());
   ASSERT_TRUE(s[0]->InputAt(0)->IsUnallocated());
-  EXPECT_EQ(param2->id(), s.ToVreg(s[0]->InputAt(0)));
+  EXPECT_EQ(s.ToVreg(param2), s.ToVreg(s[0]->InputAt(0)));
 }
 
 
 TEST_F(InstructionSelectorTest, BetterLeftOperandTestMulBinop) {
   StreamBuilder m(this, kMachInt32, kMachInt32, kMachInt32);
   Node* param1 = m.Parameter(0);
   Node* param2 = m.Parameter(1);
   Node* mul = m.Int32Mul(param1, param2);
   m.Return(m.Int32Mul(mul, param1));
   Stream s = m.Build();
   ASSERT_EQ(2U, s.size());
   EXPECT_EQ(kX64Imul32, s[0]->arch_opcode());
   ASSERT_EQ(2U, s[0]->InputCount());
   ASSERT_TRUE(s[0]->InputAt(0)->IsUnallocated());
-  EXPECT_EQ(param2->id(), s.ToVreg(s[0]->InputAt(0)));
+  EXPECT_EQ(s.ToVreg(param2), s.ToVreg(s[0]->InputAt(0)));
 }
 
 
 // -----------------------------------------------------------------------------
 // Loads and stores
 
 namespace {
 
 struct MemoryAccess {
   MachineType type;
@@ skipping 283 matching lines @@
   Stream s = m.Build();
   ASSERT_EQ(1U, s.size());
   EXPECT_EQ(m_param.addressing_mode, s[0]->addressing_mode());
   if (m_param.lea_expected) {
     EXPECT_EQ(kX64Lea32, s[0]->arch_opcode());
     ASSERT_EQ(InputCountForLea(s[0]->addressing_mode()), s[0]->InputCount());
   } else {
     EXPECT_EQ(kX64Imul32, s[0]->arch_opcode());
     ASSERT_EQ(2U, s[0]->InputCount());
   }
-  EXPECT_EQ(param->id(), s.ToVreg(s[0]->InputAt(0)));
+  EXPECT_EQ(s.ToVreg(param), s.ToVreg(s[0]->InputAt(0)));
 }
 
 
 TEST_P(InstructionSelectorMultTest, Mult64) {
   const MultParam m_param = GetParam();
   StreamBuilder m(this, kMachInt64, kMachInt64);
   Node* param = m.Parameter(0);
   Node* mult = m.Int64Mul(param, m.Int64Constant(m_param.value));
   m.Return(mult);
   Stream s = m.Build();
   ASSERT_EQ(1U, s.size());
   EXPECT_EQ(m_param.addressing_mode, s[0]->addressing_mode());
   if (m_param.lea_expected) {
     EXPECT_EQ(kX64Lea, s[0]->arch_opcode());
     ASSERT_EQ(InputCountForLea(s[0]->addressing_mode()), s[0]->InputCount());
-    EXPECT_EQ(param->id(), s.ToVreg(s[0]->InputAt(0)));
+    EXPECT_EQ(s.ToVreg(param), s.ToVreg(s[0]->InputAt(0)));
   } else {
     EXPECT_EQ(kX64Imul, s[0]->arch_opcode());
     ASSERT_EQ(2U, s[0]->InputCount());
     // TODO(dcarney): why is this happening?
-    EXPECT_EQ(param->id(), s.ToVreg(s[0]->InputAt(1)));
+    EXPECT_EQ(s.ToVreg(param), s.ToVreg(s[0]->InputAt(1)));
   }
 }
 
 
 TEST_P(InstructionSelectorMultTest, MultAdd32) {
   TRACED_FOREACH(int32_t, imm, kImmediates) {
     const MultParam m_param = GetParam();
     StreamBuilder m(this, kMachInt32, kMachInt32);
     Node* param = m.Parameter(0);
     Node* mult = m.Int32Add(m.Int32Mul(param, m.Int32Constant(m_param.value)),
@@ skipping 44 matching lines @@
   }
 }
 
 
 INSTANTIATE_TEST_CASE_P(InstructionSelectorTest, InstructionSelectorMultTest,
                         ::testing::ValuesIn(kMultParams));
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8