Revert of [Interpreter] Optimize BytecodeArrayBuilder and BytecodeArrayWriter.

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/objects-inl.h"
 #include "src/objects.h"
 #include "test/unittests/test-utils.h"
 
 namespace v8 {
 namespace internal {
 namespace interpreter {
 
 class BytecodePeepholeOptimizerTest : public BytecodePipelineStage,
                                       public TestWithIsolateAndZone {
  public:
-  BytecodePeepholeOptimizerTest()
-      : peephole_optimizer_(this), last_written_(Bytecode::kIllegal) {}
+  BytecodePeepholeOptimizerTest() : peephole_optimizer_(this) {}
   ~BytecodePeepholeOptimizerTest() override {}
 
   void Reset() {
     last_written_.set_bytecode(Bytecode::kIllegal);
     write_count_ = 0;
   }
 
   void Write(BytecodeNode* node) override {
     write_count_++;
     last_written_.Clone(node);
@@ skipping 32 matching lines @@
 // Sanity tests.
 
 TEST_F(BytecodePeepholeOptimizerTest, FlushOnJump) {
   CHECK_EQ(write_count(), 0);
 
   BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand(), 1);
   optimizer()->Write(&add);
   CHECK_EQ(write_count(), 0);
 
   BytecodeLabel target;
-  BytecodeNode jump(Bytecode::kJump, 0, nullptr);
+  BytecodeNode jump(Bytecode::kJump, 0);
   optimizer()->WriteJump(&jump, &target);
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(jump, last_written());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, FlushOnBind) {
   CHECK_EQ(write_count(), 0);
 
   BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand(), 1);
   optimizer()->Write(&add);
@@ skipping 11 matching lines @@
   BytecodeNode nop(Bytecode::kNop);
   optimizer()->Write(&nop);
   BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand(), 1);
   optimizer()->Write(&add);
   Flush();
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(add, last_written());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, ElideExpressionNop) {
-  BytecodeSourceInfo source_info(3, false);
-  BytecodeNode nop(Bytecode::kNop, &source_info);
+  BytecodeNode nop(Bytecode::kNop);
+  nop.source_info().MakeExpressionPosition(3);
   optimizer()->Write(&nop);
   BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand(), 1);
   optimizer()->Write(&add);
   Flush();
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(add, last_written());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, KeepStatementNop) {
-  BytecodeSourceInfo source_info(3, true);
-  BytecodeNode nop(Bytecode::kNop, &source_info);
+  BytecodeNode nop(Bytecode::kNop);
+  nop.source_info().MakeStatementPosition(3);
   optimizer()->Write(&nop);
-  source_info.MakeExpressionPosition(3);
-  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand(), 1, &source_info);
+  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand(), 1);
+  add.source_info().MakeExpressionPosition(3);
   optimizer()->Write(&add);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(add, last_written());
 }
 
 // Tests covering BytecodePeepholeOptimizer::UpdateCurrentBytecode().
 
 TEST_F(BytecodePeepholeOptimizerTest, KeepJumpIfToBooleanTrue) {
   BytecodeNode first(Bytecode::kLdaNull);
@@ skipping 65 matching lines @@
   optimizer()->Write(&first);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 0);
   Flush();
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, StarRxLdarRxStatement) {
   BytecodeNode first(Bytecode::kStar, Register(0).ToOperand());
-  BytecodeSourceInfo source_info(3, true);
-  BytecodeNode second(Bytecode::kLdar, Register(0).ToOperand(), &source_info);
+  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);
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written().bytecode(), Bytecode::kNop);
   CHECK_EQ(last_written().source_info(), second.source_info());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, StarRxLdarRxStatementStarRy) {
   BytecodeLabel label;
   BytecodeNode first(Bytecode::kStar, Register(0).ToOperand());
-  BytecodeSourceInfo source_info(0, true);
-  BytecodeNode second(Bytecode::kLdar, Register(0).ToOperand(), &source_info);
+  BytecodeNode second(Bytecode::kLdar, Register(0).ToOperand());
   BytecodeNode third(Bytecode::kStar, Register(3).ToOperand());
+  second.source_info().MakeStatementPosition(0);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   optimizer()->Write(&third);
   CHECK_EQ(write_count(), 1);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written(), third);
@@ skipping 34 matching lines @@
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 0);
   Flush();
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), second);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, LdaTrueStatementLdaFalse) {
-  BytecodeSourceInfo source_info(3, true);
-  BytecodeNode first(Bytecode::kLdaTrue, &source_info);
+  BytecodeNode first(Bytecode::kLdaTrue);
+  first.source_info().MakeExpressionPosition(3);
   BytecodeNode second(Bytecode::kLdaFalse);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 0);
   Flush();
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), second);
-  CHECK(second.source_info().is_statement());
+  CHECK(second.source_info().is_expression());
   CHECK_EQ(second.source_info().source_position(), 3);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, NopStackCheck) {
   BytecodeNode first(Bytecode::kNop);
-  BytecodeNode second(Bytecode::kStackCheck, nullptr);
+  BytecodeNode second(Bytecode::kStackCheck);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 0);
   Flush();
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), second);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, NopStatementStackCheck) {
-  BytecodeSourceInfo source_info(3, true);
-  BytecodeNode first(Bytecode::kNop, &source_info);
+  BytecodeNode first(Bytecode::kNop);
+  first.source_info().MakeExpressionPosition(3);
   BytecodeNode second(Bytecode::kStackCheck);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 0);
   Flush();
   CHECK_EQ(write_count(), 1);
-  BytecodeSourceInfo expected_source_info(3, true);
-  BytecodeNode expected(Bytecode::kStackCheck, &expected_source_info);
-  CHECK_EQ(last_written(), expected);
+  second.source_info().MakeExpressionPosition(
+      first.source_info().source_position());
+  CHECK_EQ(last_written(), second);
 }
 
 // Tests covering BytecodePeepholeOptimizer::UpdateLastAndCurrentBytecodes().
 
 TEST_F(BytecodePeepholeOptimizerTest, MergeLoadICStar) {
   const uint32_t operands[] = {
       static_cast<uint32_t>(Register(31).ToOperand()), 32, 33,
       static_cast<uint32_t>(Register(256).ToOperand())};
   const int expected_operand_count = static_cast<int>(arraysize(operands));
 
@@ skipping 16 matching lines @@
   Flush();
   CHECK_EQ(last_written().bytecode(), third.bytecode());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, MergeLdaKeyedPropertyStar) {
   const uint32_t operands[] = {static_cast<uint32_t>(Register(31).ToOperand()),
                                9999997,
                                static_cast<uint32_t>(Register(1).ToOperand())};
   const int expected_operand_count = static_cast<int>(arraysize(operands));
 
-  BytecodeNode first(Bytecode::kLdaKeyedProperty, operands[0], operands[1],
-                     nullptr);
+  BytecodeNode first(Bytecode::kLdaKeyedProperty, operands[0], operands[1]);
   BytecodeNode second(Bytecode::kStar, operands[2]);
   BytecodeNode third(Bytecode::kReturn);
   optimizer()->Write(&first);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdrKeyedProperty);
   CHECK_EQ(last_written().operand_count(), expected_operand_count);
   for (int i = 0; i < expected_operand_count; ++i) {
     CHECK_EQ(last_written().operand(i), operands[i]);
   }
@@ skipping 84 matching lines @@
   Bytecode operator_replacement_pairs[][2] = {
       {Bytecode::kAdd, Bytecode::kAddSmi},
       {Bytecode::kSub, Bytecode::kSubSmi},
       {Bytecode::kBitwiseAnd, Bytecode::kBitwiseAndSmi},
       {Bytecode::kBitwiseOr, Bytecode::kBitwiseOrSmi},
       {Bytecode::kShiftLeft, Bytecode::kShiftLeftSmi},
       {Bytecode::kShiftRight, Bytecode::kShiftRightSmi}};
 
   for (auto operator_replacement : operator_replacement_pairs) {
     uint32_t imm_operand = 17;
-    BytecodeSourceInfo source_info(3, true);
-    BytecodeNode first(Bytecode::kLdaSmi, imm_operand, &source_info);
+    BytecodeNode first(Bytecode::kLdaSmi, imm_operand);
+    first.source_info().Clone({3, true});
     uint32_t reg_operand = Register(0).ToOperand();
     uint32_t idx_operand = 1;
     BytecodeNode second(operator_replacement[0], reg_operand, idx_operand);
     optimizer()->Write(&first);
     optimizer()->Write(&second);
     Flush();
     CHECK_EQ(write_count(), 1);
     CHECK_EQ(last_written().bytecode(), operator_replacement[1]);
     CHECK_EQ(last_written().operand_count(), 3);
     CHECK_EQ(last_written().operand(0), imm_operand);
     CHECK_EQ(last_written().operand(1), reg_operand);
     CHECK_EQ(last_written().operand(2), idx_operand);
     CHECK_EQ(last_written().source_info(), first.source_info());
     Reset();
   }
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, NotMergingLdaSmiWithBinaryOp) {
   Bytecode operator_replacement_pairs[][2] = {
       {Bytecode::kAdd, Bytecode::kAddSmi},
       {Bytecode::kSub, Bytecode::kSubSmi},
       {Bytecode::kBitwiseAnd, Bytecode::kBitwiseAndSmi},
       {Bytecode::kBitwiseOr, Bytecode::kBitwiseOrSmi},
       {Bytecode::kShiftLeft, Bytecode::kShiftLeftSmi},
       {Bytecode::kShiftRight, Bytecode::kShiftRightSmi}};
 
   for (auto operator_replacement : operator_replacement_pairs) {
     uint32_t imm_operand = 17;
-    BytecodeSourceInfo source_info(3, true);
-    BytecodeNode first(Bytecode::kLdaSmi, imm_operand, &source_info);
+    BytecodeNode first(Bytecode::kLdaSmi, imm_operand);
+    first.source_info().Clone({3, true});
     uint32_t reg_operand = Register(0).ToOperand();
-    source_info.MakeStatementPosition(4);
-    BytecodeNode second(operator_replacement[0], reg_operand, 1, &source_info);
+    BytecodeNode second(operator_replacement[0], reg_operand, 1);
+    second.source_info().Clone({4, true});
     optimizer()->Write(&first);
     optimizer()->Write(&second);
     CHECK_EQ(last_written(), first);
     Flush();
     CHECK_EQ(last_written(), second);
     Reset();
   }
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, MergeLdaZeroWithBinaryOp) {
@@ skipping 19 matching lines @@
     CHECK_EQ(last_written().operand(0), 0);
     CHECK_EQ(last_written().operand(1), reg_operand);
     CHECK_EQ(last_written().operand(2), idx_operand);
     Reset();
   }
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8