[turbofan] fix vreg mapping for instruction selector tests

test/unittests/compiler/instruction-selector-unittest.h

 // 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.
 
 #ifndef V8_UNITTESTS_COMPILER_INSTRUCTION_SELECTOR_UNITTEST_H_
 #define V8_UNITTESTS_COMPILER_INSTRUCTION_SELECTOR_UNITTEST_H_
 
 #include <deque>
 #include <set>
 
@@ skipping 107 matching lines @@
    public:
     size_t size() const { return instructions_.size(); }
     const Instruction* operator[](size_t index) const {
       EXPECT_LT(index, size());
       return instructions_[index];
     }
 
     bool IsDouble(const InstructionOperand* operand) const {
       return IsDouble(ToVreg(operand));
     }
-    bool IsDouble(int virtual_register) const {
-      return doubles_.find(virtual_register) != doubles_.end();
-    }
+
+    bool IsDouble(const Node* node) const { return IsDouble(ToVreg(node)); }
 
     bool IsInteger(const InstructionOperand* operand) const {
       return IsInteger(ToVreg(operand));
     }
-    bool IsInteger(int virtual_register) const {
-      return !IsDouble(virtual_register) && !IsReference(virtual_register);
-    }
+
+    bool IsInteger(const Node* node) const { return IsInteger(ToVreg(node)); }
 
     bool IsReference(const InstructionOperand* operand) const {
       return IsReference(ToVreg(operand));
     }
-    bool IsReference(int virtual_register) const {
-      return references_.find(virtual_register) != references_.end();
+
+    bool IsReference(const Node* node) const {
+      return IsReference(ToVreg(node));
     }
 
     float ToFloat32(const InstructionOperand* operand) const {
       return ToConstant(operand).ToFloat32();
     }
 
     int32_t ToInt32(const InstructionOperand* operand) const {
       return ToConstant(operand).ToInt32();
     }
 
     int64_t ToInt64(const InstructionOperand* operand) const {
       return ToConstant(operand).ToInt64();
     }
 
     int ToVreg(const InstructionOperand* operand) const {
       if (operand->IsConstant()) return operand->index();
       EXPECT_EQ(InstructionOperand::UNALLOCATED, operand->kind());
       return UnallocatedOperand::cast(operand)->virtual_register();
     }
 
+    int ToVreg(const Node* node) const;
+
     FrameStateDescriptor* GetFrameStateDescriptor(int deoptimization_id) {
       EXPECT_LT(deoptimization_id, GetFrameStateDescriptorCount());
       return deoptimization_entries_[deoptimization_id];
     }
 
     int GetFrameStateDescriptorCount() {
       return static_cast<int>(deoptimization_entries_.size());
     }
 
    private:
+    bool IsDouble(int virtual_register) const {
+      return doubles_.find(virtual_register) != doubles_.end();
+    }
+
+    bool IsInteger(int virtual_register) const {
+      return !IsDouble(virtual_register) && !IsReference(virtual_register);
+    }
+
+    bool IsReference(int virtual_register) const {
+      return references_.find(virtual_register) != references_.end();
+    }
+
     Constant ToConstant(const InstructionOperand* operand) const {
       ConstantMap::const_iterator i;
       if (operand->IsConstant()) {
         i = constants_.find(operand->index());
         EXPECT_FALSE(constants_.end() == i);
       } else {
         EXPECT_EQ(InstructionOperand::IMMEDIATE, operand->kind());
         i = immediates_.find(operand->index());
         EXPECT_FALSE(immediates_.end() == i);
       }
       EXPECT_EQ(operand->index(), i->first);
       return i->second;
     }
 
     friend class StreamBuilder;
 
     typedef std::map<int, Constant> ConstantMap;
+    typedef std::map<NodeId, int> VirtualRegisters;
 
     ConstantMap constants_;
     ConstantMap immediates_;
     std::deque<Instruction*> instructions_;
     std::set<int> doubles_;
     std::set<int> references_;
+    VirtualRegisters virtual_registers_;
     std::deque<FrameStateDescriptor*> deoptimization_entries_;
   };
 
   base::RandomNumberGenerator rng_;
 };
 
 
 template <typename T>
 class InstructionSelectorTestWithParam
     : public InstructionSelectorTest,
       public ::testing::WithParamInterface<T> {};
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_UNITTESTS_COMPILER_INSTRUCTION_SELECTOR_UNITTEST_H_