[Interpreter] Remove LdaConstant+ToName peephole optimization.

src/interpreter/bytecode-peephole-optimizer.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/interpreter/bytecode-peephole-optimizer.h"
 
 #include "src/interpreter/constant-array-builder.h"

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

nit: Header file inclusion should be obsolete. Lets drop it.

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

Good catch, thanks. Done.

 #include "src/objects-inl.h"
 #include "src/objects.h"
 
 namespace v8 {
 namespace internal {
 namespace interpreter {
 
 BytecodePeepholeOptimizer::BytecodePeepholeOptimizer(
-    ConstantArrayBuilder* constant_array_builder,
     BytecodePipelineStage* next_stage)
-    : constant_array_builder_(constant_array_builder), next_stage_(next_stage) {
+    : next_stage_(next_stage) {
   InvalidateLast();
 }
 
 // override
 Handle<BytecodeArray> BytecodePeepholeOptimizer::ToBytecodeArray(
     int fixed_register_count, int parameter_count,
     Handle<FixedArray> handler_table) {
   Flush();
   return next_stage_->ToBytecodeArray(fixed_register_count, parameter_count,
                                       handler_table);
@@ skipping 47 matching lines @@
 
 void BytecodePeepholeOptimizer::SetLast(const BytecodeNode* const node) {
   // An action shouldn't leave a NOP as last bytecode unless it has
   // source position information. NOP without source information can
   // always be elided.
   DCHECK(node->bytecode() != Bytecode::kNop || node->source_info().is_valid());
 
   last_.Clone(node);
 }
 
-Handle<Object> BytecodePeepholeOptimizer::GetConstantForIndexOperand(
-    const BytecodeNode* const node, int index) const {
-  DCHECK_LE(index, node->operand_count());
-  DCHECK_EQ(Bytecodes::GetOperandType(node->bytecode(), 0), OperandType::kIdx);
-  uint32_t index_operand = node->operand(0);
-  return constant_array_builder_->At(index_operand);
-}
-
 bool BytecodePeepholeOptimizer::CanElideLastBasedOnSourcePosition(
     const BytecodeNode* const current) const {
   //
   // The rules for allowing the elision of the last bytecode based
   // on source position are:
   //
   //                     C U R R E N T
   //              +--------+--------+--------+
   //              |  None  |  Expr  |  Stmt  |
   //  L  +--------+--------+--------+--------+
@@ skipping 178 matching lines @@
   if (!node->source_info().is_valid() || !last()->source_info().is_valid()) {
     // Fused last and current into current.
     TransformLdaZeroBinaryOpToBinaryOpWithZero(action_data->bytecode, last(),
                                                node);
     SetLast(node);
   } else {
     DefaultAction(node);
   }
 }
 
-void BytecodePeepholeOptimizer::TransformToStarIfLoadingNameConstantAction(
-    BytecodeNode* const node, const PeepholeActionAndData* action_data) {
-  DCHECK_EQ(last()->bytecode(), Bytecode::kLdaConstant);
-  DCHECK(!Bytecodes::IsJump(node->bytecode()));
-
-  // TODO(5203): Remove this temporary exception.
-  AllowHandleDereference allow_deref;
-  if (GetConstantForIndexOperand(last(), 0)->IsName()) {
-    node->replace_bytecode(Bytecode::kStar);
-  }
-  DefaultAction(node);
-}
-
 void BytecodePeepholeOptimizer::DefaultJumpAction(
     BytecodeNode* const node, const PeepholeActionAndData* action_data) {
   DCHECK(LastIsValid());
   DCHECK(Bytecodes::IsJump(node->bytecode()));
 
   next_stage()->Write(last());
   InvalidateLast();
 }
 
 void BytecodePeepholeOptimizer::UpdateLastJumpAction(
@@ skipping 42 matching lines @@
 #undef CASE
     default:
       UNREACHABLE();
       break;
   }
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8