[turbofan] smash GapInstruction into Instruction

test/cctest/compiler/test-jump-threading.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/instruction.h"
 #include "src/compiler/instruction-codes.h"
 #include "src/compiler/jump-threading.h"
@@ skipping 40 matching lines @@
     End();
     return pos;
   }
   void Nop() {
     Start();
     sequence_.AddInstruction(Instruction::New(main_zone(), kArchNop));
   }
   void RedundantMoves() {
     Start();
     sequence_.AddInstruction(Instruction::New(main_zone(), kArchNop));
-    int index = static_cast<int>(sequence_.instructions().size()) - 2;
-    sequence_.AddGapMove(index, RegisterOperand::New(13, main_zone()),
-                         RegisterOperand::New(13, main_zone()));
+    int index = static_cast<int>(sequence_.instructions().size()) - 1;
+    AddGapMove(index, RegisterOperand::New(13, main_zone()),
+               RegisterOperand::New(13, main_zone()));
   }
   void NonRedundantMoves() {
     Start();
     sequence_.AddInstruction(Instruction::New(main_zone(), kArchNop));
-    int index = static_cast<int>(sequence_.instructions().size()) - 2;
-    sequence_.AddGapMove(index, ImmediateOperand::New(11, main_zone()),
-                         RegisterOperand::New(11, main_zone()));
+    int index = static_cast<int>(sequence_.instructions().size()) - 1;
+    AddGapMove(index, ImmediateOperand::New(11, main_zone()),
+               RegisterOperand::New(11, main_zone()));
   }
   void Other() {
     Start();
     sequence_.AddInstruction(Instruction::New(main_zone(), 155));
   }
   void End() {
     Start();
     sequence_.EndBlock(current_->rpo_number());
     current_ = NULL;
     rpo_number_ = RpoNumber::FromInt(rpo_number_.ToInt() + 1);
   }
   InstructionOperand UseRpo(int num) {
     int index = sequence_.AddImmediate(Constant(RpoNumber::FromInt(num)));
     return ImmediateOperand(index);
   }
   void Start(bool deferred = false) {
     if (current_ == NULL) {
       current_ = new (main_zone())
           InstructionBlock(main_zone(), rpo_number_, RpoNumber::Invalid(),
                            RpoNumber::Invalid(), deferred);
       blocks_.push_back(current_);
       sequence_.StartBlock(rpo_number_);
     }
   }
   void Defer() {
     CHECK(current_ == NULL);
     Start(true);
   }
+  void AddGapMove(int index, InstructionOperand* from, InstructionOperand* to) {
+    sequence_.InstructionAt(index)
+        ->GetOrCreateParallelMove(Instruction::START, main_zone())
+        ->AddMove(from, to, main_zone());
+  }
 };
 
 
 void VerifyForwarding(TestCode& code, int count, int* expected) {
   Zone local_zone;
   ZoneVector<RpoNumber> result(&local_zone);
   JumpThreading::ComputeForwarding(&local_zone, result, &code.sequence_);
 
   CHECK(count == static_cast<int>(result.size()));
   for (int i = 0; i < count; i++) {
@@ skipping 644 matching lines @@
         for (int k = 4; k < 5; k++) assembly[k]--;
       }
       CheckAssemblyOrder(code, 5, assembly);
     }
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8