[interpreter] Address naming inconsistencies in bytecodes.

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-peephole-optimizer.h"
 #include "src/interpreter/constant-array-builder.h"
 #include "src/objects-inl.h"
@@ skipping 370 matching lines @@
 }
 
 // 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));
 
-  BytecodeNode first(Bytecode::kLoadIC, operands[0], operands[1], operands[2],
-                     OperandScale::kSingle);
+  BytecodeNode first(Bytecode::kLdaNamedProperty, operands[0], operands[1],
+                     operands[2], OperandScale::kSingle);
   BytecodeNode second(Bytecode::kStar, operands[3], OperandScale::kDouble);
   BytecodeNode third(Bytecode::kReturn);
   optimizer()->Write(&first);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdrNamedProperty);
   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]);
   }
   CHECK_EQ(last_written().operand_scale(),
            std::max(first.operand_scale(), second.operand_scale()));
   optimizer()->Write(&third);
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdar);
   CHECK_EQ(last_written().operand(0), operands[expected_operand_count - 1]);
   optimizer()->FlushBasicBlock();
   CHECK_EQ(last_written().bytecode(), third.bytecode());
 }
 
-TEST_F(BytecodePeepholeOptimizerTest, MergeKeyedLoadICStar) {
+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::kKeyedLoadIC, operands[0], operands[1],
+  BytecodeNode first(Bytecode::kLdaKeyedProperty, operands[0], operands[1],
                      OperandScale::kQuadruple);
   BytecodeNode second(Bytecode::kStar, operands[2], OperandScale::kSingle);
   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 85 matching lines @@
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdar);
   CHECK_EQ(last_written().operand(0), operands[expected_operand_count - 1]);
   optimizer()->FlushBasicBlock();
   CHECK_EQ(last_written().bytecode(), third.bytecode());
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8