Revert of [interpeter] Move to table based peephole optimizer.

test/unittests/interpreter/bytecode-peephole-optimizer-unittest.cc

 // Copyright 2016 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 "src/factory.h"
 #include "src/interpreter/bytecode-label.h"
 #include "src/interpreter/bytecode-peephole-optimizer.h"
 #include "src/interpreter/constant-array-builder.h"
@@ skipping 116 matching lines @@
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(add, last_written());
 }
 
 // Tests covering BytecodePeepholeOptimizer::UpdateCurrentBytecode().
 
 TEST_F(BytecodePeepholeOptimizerTest, KeepJumpIfToBooleanTrue) {
   BytecodeNode first(Bytecode::kLdaNull);
   BytecodeNode second(Bytecode::kJumpIfToBooleanTrue, 3);
-  BytecodeLabel label;
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
-  optimizer()->WriteJump(&second, &label);
+  optimizer()->Write(&second);
+  CHECK_EQ(write_count(), 1);
+  CHECK_EQ(last_written(), first);
+  Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written(), second);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, ElideJumpIfToBooleanTrue) {
   BytecodeNode first(Bytecode::kLdaTrue);
   BytecodeNode second(Bytecode::kJumpIfToBooleanTrue, 3);
-  BytecodeLabel label;
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
-  optimizer()->WriteJump(&second, &label);
+  optimizer()->Write(&second);
+  CHECK_EQ(write_count(), 1);
+  CHECK_EQ(last_written(), first);
+  Flush();
   CHECK_EQ(write_count(), 2);
-  CHECK_EQ(last_written(), second);
+  CHECK_EQ(last_written().bytecode(), Bytecode::kJumpIfTrue);
+  CHECK_EQ(last_written().operand(0), second.operand(0));
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, KeepToBooleanLogicalNot) {
   BytecodeNode first(Bytecode::kLdaNull);
   BytecodeNode second(Bytecode::kToBooleanLogicalNot);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
@@ skipping 28 matching lines @@
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written(), second);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, StarRxLdarRx) {
   BytecodeLabel label;
   BytecodeNode first(Bytecode::kStar, Register(0).ToOperand());
   BytecodeNode second(Bytecode::kLdar, Register(0).ToOperand());
   optimizer()->Write(&first);
+  CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
-  CHECK_EQ(write_count(), 0);
+  CHECK_EQ(write_count(), 1);
+  CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 1);
-  CHECK_EQ(last_written(), first);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, StarRxLdarRxStatement) {
   BytecodeNode first(Bytecode::kStar, Register(0).ToOperand());
   BytecodeNode second(Bytecode::kLdar, Register(0).ToOperand());
   second.source_info().MakeStatementPosition(0);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
@@ skipping 32 matching lines @@
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written(), second);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, ToNameToName) {
   BytecodeNode first(Bytecode::kToName);
   BytecodeNode second(Bytecode::kToName);
   optimizer()->Write(&first);
+  CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
-  CHECK_EQ(write_count(), 0);
+  CHECK_EQ(write_count(), 1);
+  CHECK_EQ(last_written(), first);
   Flush();
-  CHECK_EQ(last_written(), first);
   CHECK_EQ(write_count(), 1);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, TypeOfToName) {
   BytecodeNode first(Bytecode::kTypeOf);
   BytecodeNode second(Bytecode::kToName);
   optimizer()->Write(&first);
+  CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
-  CHECK_EQ(write_count(), 0);
+  CHECK_EQ(write_count(), 1);
+  CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 1);
-  CHECK_EQ(last_written(), first);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, LdaConstantStringToName) {
   Handle<Object> word =
       isolate()->factory()->NewStringFromStaticChars("optimizing");
   size_t index = constant_array()->Insert(word);
   BytecodeNode first(Bytecode::kLdaConstant, static_cast<uint32_t>(index));
   BytecodeNode second(Bytecode::kToName);
   optimizer()->Write(&first);
+  CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
-  CHECK_EQ(write_count(), 0);
+  CHECK_EQ(write_count(), 1);
+  CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 1);
-  CHECK_EQ(last_written(), first);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, LdaConstantNumberToName) {
   Handle<Object> word = isolate()->factory()->NewNumber(0.380);
   size_t index = constant_array()->Insert(word);
   BytecodeNode first(Bytecode::kLdaConstant, static_cast<uint32_t>(index));
   BytecodeNode second(Bytecode::kToName);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
@@ skipping 260 matching lines @@
     CHECK_EQ(last_written().operand_count(), 2);
     CHECK_EQ(last_written().operand(0), 0);
     CHECK_EQ(last_written().operand(1), reg_operand);
     Reset();
   }
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8