[turbofan] push virtual register field down to InstructionOperand

test/cctest/compiler/test-instruction.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/v8.h"
 #include "test/cctest/cctest.h"
 
 #include "src/compiler/code-generator.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
@@ skipping 72 matching lines @@
     return node;
   }
 
   int NewInstr() {
     InstructionCode opcode = static_cast<InstructionCode>(110);
     TestInstr* instr = TestInstr::New(zone(), opcode);
     return code->AddInstruction(instr);
   }
 
   UnallocatedOperand* NewUnallocated(int vreg) {
-    UnallocatedOperand* unallocated =
-        new (zone()) UnallocatedOperand(UnallocatedOperand::ANY);
-    unallocated->set_virtual_register(vreg);
-    return unallocated;
+    return new (zone()) UnallocatedOperand(UnallocatedOperand::ANY, vreg);
   }
 
   InstructionBlock* BlockAt(BasicBlock* block) {
     return code->InstructionBlockAt(block->GetRpoNumber());
   }
   BasicBlock* GetBasicBlock(int instruction_index) {
     const InstructionBlock* block =
         code->GetInstructionBlock(instruction_index);
     return schedule.rpo_order()->at(block->rpo_number().ToSize());
   }
@@ skipping 184 matching lines @@
 TEST(InstructionOperands) {
   Zone zone;
 
   {
     TestInstr* i = TestInstr::New(&zone, 101);
     CHECK_EQ(0, static_cast<int>(i->OutputCount()));
     CHECK_EQ(0, static_cast<int>(i->InputCount()));
     CHECK_EQ(0, static_cast<int>(i->TempCount()));
   }
 
+  int vreg = 15;
   InstructionOperand* outputs[] = {
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER),
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER),
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER),
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER)};
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg),
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg),
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg),
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg)};
 
   InstructionOperand* inputs[] = {
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER),
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER),
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER),
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER)};
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg),
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg),
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg),
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg)};
 
   InstructionOperand* temps[] = {
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER),
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER),
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER),
-      new (&zone) UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER)};
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg),
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg),
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg),
+      new (&zone)
+          UnallocatedOperand(UnallocatedOperand::MUST_HAVE_REGISTER, vreg)};
 
   for (size_t i = 0; i < arraysize(outputs); i++) {
     for (size_t j = 0; j < arraysize(inputs); j++) {
       for (size_t k = 0; k < arraysize(temps); k++) {
         TestInstr* m =
             TestInstr::New(&zone, 101, i, outputs, j, inputs, k, temps);
         CHECK(i == m->OutputCount());
         CHECK(j == m->InputCount());
         CHECK(k == m->TempCount());
 
         for (size_t z = 0; z < i; z++) {
           CHECK(outputs[z]->Equals(m->OutputAt(z)));
         }
 
         for (size_t z = 0; z < j; z++) {
           CHECK(inputs[z]->Equals(m->InputAt(z)));
         }
 
         for (size_t z = 0; z < k; z++) {
           CHECK(temps[z]->Equals(m->TempAt(z)));
         }
       }
     }
   }
 }