[turbofan] cleanup InstructionOperand a little

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 148 matching lines @@
 
     int64_t ToInt64(const InstructionOperand* operand) const {
       return ToConstant(operand).ToInt64();
     }
 
     Handle<HeapObject> ToHeapObject(const InstructionOperand* operand) const {
       return ToConstant(operand).ToHeapObject();
     }
 
     int ToVreg(const InstructionOperand* operand) const {
-      if (operand->IsConstant()) return operand->index();
+      if (operand->IsConstant()) {
+        return ConstantOperand::cast(operand)->virtual_register();
+      }
       EXPECT_EQ(InstructionOperand::UNALLOCATED, operand->kind());
       return UnallocatedOperand::cast(operand)->virtual_register();
     }
 
     int ToVreg(const Node* node) const;
 
     bool IsFixed(const InstructionOperand* operand, Register reg) const;
     bool IsSameAsFirst(const InstructionOperand* operand) const;
     bool IsUsedAtStart(const InstructionOperand* operand) const;
 
@@ skipping 15 matching lines @@
       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());
+        i = constants_.find(ConstantOperand::cast(operand)->virtual_register());
+        EXPECT_EQ(ConstantOperand::cast(operand)->virtual_register(), i->first);
         EXPECT_FALSE(constants_.end() == i);
       } else {
         EXPECT_EQ(InstructionOperand::IMMEDIATE, operand->kind());
-        i = immediates_.find(operand->index());
+        i = immediates_.find(ImmediateOperand::cast(operand)->index());
+        EXPECT_EQ(ImmediateOperand::cast(operand)->index(), i->first);
         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_;
@@ skipping 11 matching lines @@
 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_