Remove StringCharCodeAtInstr and handle it as part of LoadIndexed.

runtime/vm/intermediate_language.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 254 matching lines @@
   M(MathSqrt)                                                                  \
   M(UnboxDouble)                                                               \
   M(BoxDouble)                                                                 \
   M(UnboxInteger)                                                              \
   M(BoxInteger)                                                                \
   M(BinaryMintOp)                                                              \
   M(ShiftMintOp)                                                               \
   M(UnaryMintOp)                                                               \
   M(CheckArrayBound)                                                           \
   M(Constraint)                                                                \
-  M(StringCharCodeAt)                                                          \
   M(StringFromCharCode)
 
 
 #define FORWARD_DECLARATION(type) class type##Instr;
 FOR_EACH_INSTRUCTION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 
 // Functions required in all concrete instruction classes.
 #define DECLARE_INSTRUCTION(type)                                              \
@@ skipping 218 matching lines @@
   friend class BinaryMintOpInstr;
   friend class BinarySmiOpInstr;
   friend class UnarySmiOpInstr;
   friend class ShiftMintOpInstr;
   friend class UnaryMintOpInstr;
   friend class MathSqrtInstr;
   friend class CheckClassInstr;
   friend class CheckSmiInstr;
   friend class CheckArrayBoundInstr;
   friend class CheckEitherNonSmiInstr;
-  friend class StringCharCodeAtInstr;
   friend class LICM;
   friend class DoubleToSmiInstr;
   friend class DoubleToDoubleInstr;
 
   intptr_t deopt_id_;
   intptr_t lifetime_position_;  // Position used by register allocator.
   Instruction* previous_;
   Instruction* next_;
   Environment* env_;
   intptr_t expr_id_;
@@ skipping 2145 matching lines @@
 
   virtual intptr_t ResultCid() const { return kDynamicCid; }
 
  private:
   const Field& field_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreStaticFieldInstr);
 };
 
 
-class StringCharCodeAtInstr : public TemplateDefinition<2> {
+class LoadIndexedInstr : public TemplateDefinition<2> {
  public:
-  StringCharCodeAtInstr(Value* receiver,
-                        Value* index,
-                        intptr_t class_id)
+  LoadIndexedInstr(Value* array, Value* index, intptr_t class_id)
       : class_id_(class_id) {
-    ASSERT(receiver != NULL);
+    ASSERT(array != NULL);
     ASSERT(index != NULL);
-    inputs_[0] = receiver;
+    inputs_[0] = array;
     inputs_[1] = index;
   }
 
-  DECLARE_INSTRUCTION(StringCharCodeAt)
+  DECLARE_INSTRUCTION(LoadIndexed)
   virtual RawAbstractType* CompileType() const;
 
-  Value* receiver() const { return inputs_[0]; }
+  Value* array() const { return inputs_[0]; }
   Value* index() const { return inputs_[1]; }
   intptr_t class_id() const { return class_id_; }
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual bool HasSideEffect() const { return false; }
 
   virtual intptr_t ResultCid() const;
 
+  virtual Representation representation() const;
+
   virtual bool AttributesEqual(Instruction* other) const;
 
   virtual bool AffectedBySideEffect() const { return true; }
 
   virtual void InferRange();
 
  private:
   const intptr_t class_id_;
 
-  DISALLOW_COPY_AND_ASSIGN(StringCharCodeAtInstr);
+  DISALLOW_COPY_AND_ASSIGN(LoadIndexedInstr);
 };
 
 
 class StringFromCharCodeInstr : public TemplateDefinition<1> {
  public:
   explicit StringFromCharCodeInstr(Value* char_code,
                                    intptr_t cid) : cid_(cid) {
     ASSERT(char_code != NULL);
-    ASSERT(char_code->definition()->IsStringCharCodeAt() &&
-           (char_code->definition()->AsStringCharCodeAt()->class_id() ==
+    ASSERT(char_code->definition()->IsLoadIndexed() &&
+           (char_code->definition()->AsLoadIndexed()->class_id() ==
             kOneByteStringCid));
     inputs_[0] = char_code;
   }
 
   DECLARE_INSTRUCTION(StringFromCharCode)
   virtual RawAbstractType* CompileType() const;
 
   Value* char_code() const { return inputs_[0]; }
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual bool HasSideEffect() const { return false; }
 
   virtual intptr_t ResultCid() const {  return cid_; }
 
   virtual bool AttributesEqual(Instruction* other) const { return true; }
 
   virtual bool AffectedBySideEffect() const { return false; }
 
  private:
   const intptr_t cid_;
 
   DISALLOW_COPY_AND_ASSIGN(StringFromCharCodeInstr);
 };
 
 
-class LoadIndexedInstr : public TemplateDefinition<2> {
- public:
-  LoadIndexedInstr(Value* array, Value* index, intptr_t class_id)
-      : class_id_(class_id) {
-    ASSERT(array != NULL);
-    ASSERT(index != NULL);
-    inputs_[0] = array;
-    inputs_[1] = index;
-  }
-
-  DECLARE_INSTRUCTION(LoadIndexed)
-  virtual RawAbstractType* CompileType() const;
-
-  Value* array() const { return inputs_[0]; }
-  Value* index() const { return inputs_[1]; }
-  intptr_t class_id() const { return class_id_; }
-
-  virtual bool CanDeoptimize() const { return false; }
-
-  virtual bool HasSideEffect() const { return false; }
-
-  virtual intptr_t ResultCid() const;
-
-  virtual Representation representation() const;
-
-  virtual bool AttributesEqual(Instruction* other) const;
-
-  virtual bool AffectedBySideEffect() const { return true; }
-
-  virtual void InferRange();
-
- private:
-  const intptr_t class_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(LoadIndexedInstr);
-};
-
-
 class StoreIndexedInstr : public TemplateDefinition<3> {
  public:
   StoreIndexedInstr(Value* array,
                     Value* index,
                     Value* value,
                     bool emit_store_barrier,
                     intptr_t class_id,
                     intptr_t deopt_id)
       : emit_store_barrier_(emit_store_barrier),
         class_id_(class_id),
@@ skipping 1597 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_