[Interpreter] Remove LdaConstant+ToName peephole optimization.

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"

[Michael Starzinger, 2016/08/11 13:19:15]

nit: Header file inclusion is obsolete. Lets drop it.

[rmcilroy, 2016/08/11 14:46:17]

Done.

 #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()
-      : constant_array_builder_(isolate(), zone()),
-        peephole_optimizer_(&constant_array_builder_, this) {}
+  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 10 matching lines @@
       int fixed_register_count, int parameter_count,
       Handle<FixedArray> handle_table) override {
     return Handle<BytecodeArray>();
   }
 
   void Flush() {
     optimizer()->ToBytecodeArray(0, 0, factory()->empty_fixed_array());
   }
 
   BytecodePeepholeOptimizer* optimizer() { return &peephole_optimizer_; }
-  ConstantArrayBuilder* constant_array() { return &constant_array_builder_; }
 
   int write_count() const { return write_count_; }
   const BytecodeNode& last_written() const { return last_written_; }
 
  private:
-  ConstantArrayBuilder constant_array_builder_;
   BytecodePeepholeOptimizer peephole_optimizer_;
 
   int write_count_ = 0;
   BytecodeNode last_written_;
 };
 
 // Sanity tests.
 
 TEST_F(BytecodePeepholeOptimizerTest, FlushOnJump) {
   CHECK_EQ(write_count(), 0);
@@ skipping 187 matching lines @@
   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(), second);
   CHECK_EQ(last_written().bytecode(), Bytecode::kStar);
 }
 
-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, Register(0).ToOperand());
-  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(), second);
-  CHECK_EQ(last_written().bytecode(), Bytecode::kStar);
-}
-
-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, Register(0).ToOperand());
-  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(), second);
-}
-
 // Tests covering BytecodePeepholeOptimizer::CanElideLast().
 
 TEST_F(BytecodePeepholeOptimizerTest, LdaTrueLdaFalse) {
   BytecodeNode first(Bytecode::kLdaTrue);
   BytecodeNode second(Bytecode::kLdaFalse);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 0);
   Flush();
@@ skipping 243 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