[turbofan] remove some of the dependency of Instruction on Schedule

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 63 matching lines @@
     schedule.AddNode(schedule.start(), node);
     return node;
   }
 
   Node* NewNode(BasicBlock* block) {
     Node* node = graph.NewNode(common.Int32Constant(111));
     schedule.AddNode(block, node);
     return node;
   }
 
-  int NewInstr(BasicBlock* block) {
+  int NewInstr() {
     InstructionCode opcode = static_cast<InstructionCode>(110);
     TestInstr* instr = TestInstr::New(zone(), opcode);
-    return code->AddInstruction(instr, block);
+    return code->AddInstruction(instr);
   }
 
   UnallocatedOperand* NewUnallocated(int vreg) {
     UnallocatedOperand* unallocated =
         new (zone()) UnallocatedOperand(UnallocatedOperand::ANY);
     unallocated->set_virtual_register(vreg);
     return unallocated;
   }
 };
 
@@ skipping 17 matching lines @@
   CHECK_EQ(R.graph.NodeCount(), R.code->node_count());
 
   BasicBlockVector* blocks = R.schedule.rpo_order();
   CHECK_EQ(static_cast<int>(blocks->size()), R.code->BasicBlockCount());
 
   int index = 0;
   for (BasicBlockVectorIter i = blocks->begin(); i != blocks->end();
        i++, index++) {
     BasicBlock* block = *i;
     CHECK_EQ(block, R.code->BlockAt(index));
-    CHECK_EQ(-1, R.code->GetLoopEnd(block));
+    CHECK_EQ(-1, block->loop_end());
   }
 }
 
 
 TEST(InstructionGetBasicBlock) {
   InstructionTester R;
 
   BasicBlock* b0 = R.schedule.start();
   BasicBlock* b1 = R.schedule.NewBasicBlock();
   BasicBlock* b2 = R.schedule.NewBasicBlock();
   BasicBlock* b3 = R.schedule.end();
 
   R.schedule.AddGoto(b0, b1);
   R.schedule.AddGoto(b1, b2);
   R.schedule.AddGoto(b2, b3);
 
   R.allocCode();
 
   R.code->StartBlock(b0);
-  int i0 = R.NewInstr(b0);
-  int i1 = R.NewInstr(b0);
+  int i0 = R.NewInstr();
+  int i1 = R.NewInstr();
   R.code->EndBlock(b0);
   R.code->StartBlock(b1);
-  int i2 = R.NewInstr(b1);
-  int i3 = R.NewInstr(b1);
-  int i4 = R.NewInstr(b1);
-  int i5 = R.NewInstr(b1);
+  int i2 = R.NewInstr();
+  int i3 = R.NewInstr();
+  int i4 = R.NewInstr();
+  int i5 = R.NewInstr();
   R.code->EndBlock(b1);
   R.code->StartBlock(b2);
-  int i6 = R.NewInstr(b2);
-  int i7 = R.NewInstr(b2);
-  int i8 = R.NewInstr(b2);
+  int i6 = R.NewInstr();
+  int i7 = R.NewInstr();
+  int i8 = R.NewInstr();
   R.code->EndBlock(b2);
   R.code->StartBlock(b3);
   R.code->EndBlock(b3);
 
   CHECK_EQ(b0, R.code->GetBasicBlock(i0));
   CHECK_EQ(b0, R.code->GetBasicBlock(i1));
 
   CHECK_EQ(b1, R.code->GetBasicBlock(i2));
   CHECK_EQ(b1, R.code->GetBasicBlock(i3));
   CHECK_EQ(b1, R.code->GetBasicBlock(i4));
   CHECK_EQ(b1, R.code->GetBasicBlock(i5));
 
   CHECK_EQ(b2, R.code->GetBasicBlock(i6));
   CHECK_EQ(b2, R.code->GetBasicBlock(i7));
   CHECK_EQ(b2, R.code->GetBasicBlock(i8));
 
-  CHECK_EQ(b0, R.code->GetBasicBlock(b0->first_instruction_index()));
-  CHECK_EQ(b0, R.code->GetBasicBlock(b0->last_instruction_index()));
+  CHECK_EQ(b0, R.code->GetBasicBlock(R.code->first_instruction_index(b0)));
+  CHECK_EQ(b0, R.code->GetBasicBlock(R.code->last_instruction_index(b0)));
 
-  CHECK_EQ(b1, R.code->GetBasicBlock(b1->first_instruction_index()));
-  CHECK_EQ(b1, R.code->GetBasicBlock(b1->last_instruction_index()));
+  CHECK_EQ(b1, R.code->GetBasicBlock(R.code->first_instruction_index(b1)));
+  CHECK_EQ(b1, R.code->GetBasicBlock(R.code->last_instruction_index(b1)));
 
-  CHECK_EQ(b2, R.code->GetBasicBlock(b2->first_instruction_index()));
-  CHECK_EQ(b2, R.code->GetBasicBlock(b2->last_instruction_index()));
+  CHECK_EQ(b2, R.code->GetBasicBlock(R.code->first_instruction_index(b2)));
+  CHECK_EQ(b2, R.code->GetBasicBlock(R.code->last_instruction_index(b2)));
 
-  CHECK_EQ(b3, R.code->GetBasicBlock(b3->first_instruction_index()));
-  CHECK_EQ(b3, R.code->GetBasicBlock(b3->last_instruction_index()));
+  CHECK_EQ(b3, R.code->GetBasicBlock(R.code->first_instruction_index(b3)));
+  CHECK_EQ(b3, R.code->GetBasicBlock(R.code->last_instruction_index(b3)));
 }
 
 
 TEST(InstructionIsGapAt) {
   InstructionTester R;
 
   BasicBlock* b0 = R.schedule.start();
   R.schedule.AddReturn(b0, R.Int32Constant(1));
 
   R.allocCode();
   TestInstr* i0 = TestInstr::New(R.zone(), 100);
   TestInstr* g = TestInstr::New(R.zone(), 103)->MarkAsControl();
   R.code->StartBlock(b0);
-  R.code->AddInstruction(i0, b0);
-  R.code->AddInstruction(g, b0);
+  R.code->AddInstruction(i0);
+  R.code->AddInstruction(g);
   R.code->EndBlock(b0);
 
   CHECK_EQ(true, R.code->InstructionAt(0)->IsBlockStart());
 
   CHECK_EQ(true, R.code->IsGapAt(0));   // Label
   CHECK_EQ(true, R.code->IsGapAt(1));   // Gap
   CHECK_EQ(false, R.code->IsGapAt(2));  // i0
   CHECK_EQ(true, R.code->IsGapAt(3));   // Gap
   CHECK_EQ(true, R.code->IsGapAt(4));   // Gap
   CHECK_EQ(false, R.code->IsGapAt(5));  // g
 }
 
 
 TEST(InstructionIsGapAt2) {
   InstructionTester R;
 
   BasicBlock* b0 = R.schedule.start();
   BasicBlock* b1 = R.schedule.end();
   R.schedule.AddGoto(b0, b1);
   R.schedule.AddReturn(b1, R.Int32Constant(1));
 
   R.allocCode();
   TestInstr* i0 = TestInstr::New(R.zone(), 100);
   TestInstr* g = TestInstr::New(R.zone(), 103)->MarkAsControl();
   R.code->StartBlock(b0);
-  R.code->AddInstruction(i0, b0);
-  R.code->AddInstruction(g, b0);
+  R.code->AddInstruction(i0);
+  R.code->AddInstruction(g);
   R.code->EndBlock(b0);
 
   TestInstr* i1 = TestInstr::New(R.zone(), 102);
   TestInstr* g1 = TestInstr::New(R.zone(), 104)->MarkAsControl();
   R.code->StartBlock(b1);
-  R.code->AddInstruction(i1, b1);
-  R.code->AddInstruction(g1, b1);
+  R.code->AddInstruction(i1);
+  R.code->AddInstruction(g1);
   R.code->EndBlock(b1);
 
   CHECK_EQ(true, R.code->InstructionAt(0)->IsBlockStart());
 
   CHECK_EQ(true, R.code->IsGapAt(0));   // Label
   CHECK_EQ(true, R.code->IsGapAt(1));   // Gap
   CHECK_EQ(false, R.code->IsGapAt(2));  // i0
   CHECK_EQ(true, R.code->IsGapAt(3));   // Gap
   CHECK_EQ(true, R.code->IsGapAt(4));   // Gap
   CHECK_EQ(false, R.code->IsGapAt(5));  // g
@@ skipping 12 matching lines @@
 TEST(InstructionAddGapMove) {
   InstructionTester R;
 
   BasicBlock* b0 = R.schedule.start();
   R.schedule.AddReturn(b0, R.Int32Constant(1));
 
   R.allocCode();
   TestInstr* i0 = TestInstr::New(R.zone(), 100);
   TestInstr* g = TestInstr::New(R.zone(), 103)->MarkAsControl();
   R.code->StartBlock(b0);
-  R.code->AddInstruction(i0, b0);
-  R.code->AddInstruction(g, b0);
+  R.code->AddInstruction(i0);
+  R.code->AddInstruction(g);
   R.code->EndBlock(b0);
 
   CHECK_EQ(true, R.code->InstructionAt(0)->IsBlockStart());
 
   CHECK_EQ(true, R.code->IsGapAt(0));   // Label
   CHECK_EQ(true, R.code->IsGapAt(1));   // Gap
   CHECK_EQ(false, R.code->IsGapAt(2));  // i0
   CHECK_EQ(true, R.code->IsGapAt(3));   // Gap
   CHECK_EQ(true, R.code->IsGapAt(4));   // Gap
   CHECK_EQ(false, R.code->IsGapAt(5));  // g
@@ skipping 63 matching lines @@
           CHECK_EQ(inputs[z], m->InputAt(z));
         }
 
         for (size_t z = 0; z < k; z++) {
           CHECK_EQ(temps[z], m->TempAt(z));
         }
       }
     }
   }
 }