Change indexed load and store IL instructions to fit with SSA backend.

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 556 matching lines @@
         function_name_(function_name),
         token_kind_(token_kind),
         arguments_(arguments),
         argument_names_(argument_names),
         checked_argument_count_(checked_argument_count) {
     ASSERT(function_name.IsZoneHandle());
     ASSERT(!arguments->is_empty());
     ASSERT(argument_names.IsZoneHandle());
     ASSERT(Token::IsBinaryToken(token_kind) ||
            Token::IsUnaryToken(token_kind) ||
+           Token::IsIndexOperator(token_kind) ||
            token_kind == Token::kGET ||
            token_kind == Token::kSET ||
            token_kind == Token::kILLEGAL);
   }
 
   DECLARE_CALL_COMPUTATION(InstanceCall)
 
   intptr_t token_pos() const { return token_pos_; }
   intptr_t try_index() const { return try_index_; }
   const String& function_name() const { return function_name_; }
@@ skipping 410 matching lines @@
 
  private:
   const Field& field_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreStaticFieldComp);
 };
 
 
 class LoadIndexedComp : public TemplateComputation<2> {
  public:
-  LoadIndexedComp(intptr_t token_pos,
-                  intptr_t try_index,
-                  Value* array,
-                  Value* index)
-      : token_pos_(token_pos),
-        try_index_(try_index),
-        receiver_type_(kIllegalCid) {
+  LoadIndexedComp(Value* array,
+                  Value* index,
+                  intptr_t receiver_type,
+                  InstanceCallComp* original)
+      : receiver_type_(receiver_type),
+        original_(original) {
     ASSERT(array != NULL);
     ASSERT(index != NULL);
     inputs_[0] = array;
     inputs_[1] = index;
   }
 
   DECLARE_COMPUTATION(LoadIndexed)
 
-  intptr_t token_pos() const { return token_pos_; }
-  intptr_t try_index() const { return try_index_; }
   Value* array() const { return inputs_[0]; }
   Value* index() const { return inputs_[1]; }
 
-  void set_receiver_type(intptr_t receiver_type) {
-    receiver_type_ = receiver_type;
-  }
+  intptr_t receiver_type() const { return receiver_type_; }
 
-  intptr_t receiver_type() const {
-    return receiver_type_;
-  }
+  InstanceCallComp* original() const { return original_; }
 
   virtual bool CanDeoptimize() const { return true; }
 
  private:
-  const intptr_t token_pos_;
-  const intptr_t try_index_;
   intptr_t receiver_type_;
+  InstanceCallComp* original_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadIndexedComp);
 };
 
 
-// Not simply an InstanceCall because it has somewhat more complicated
-// semantics: the value operand is preserved before the call.
 class StoreIndexedComp : public TemplateComputation<3> {
  public:
-  StoreIndexedComp(intptr_t token_pos,
-                   intptr_t try_index,
-                   Value* array,
+  StoreIndexedComp(Value* array,
                    Value* index,
-                   Value* value)
-      : token_pos_(token_pos),
-        try_index_(try_index),
-        receiver_type_(kIllegalCid) {
+                   Value* value,
+                   intptr_t receiver_type,
+                   InstanceCallComp* original)
+        : receiver_type_(receiver_type),
+          original_(original) {
     ASSERT(array != NULL);
     ASSERT(index != NULL);
     ASSERT(value != NULL);
     inputs_[0] = array;
     inputs_[1] = index;
     inputs_[2] = value;
   }
 
   DECLARE_COMPUTATION(StoreIndexed)
 
-  intptr_t token_pos() const { return token_pos_; }
-  intptr_t try_index() const { return try_index_; }
   Value* array() const { return inputs_[0]; }
   Value* index() const { return inputs_[1]; }
   Value* value() const { return inputs_[2]; }
 
-  void set_receiver_type(intptr_t receiver_type) {
-    receiver_type_ = receiver_type;
-  }
+  InstanceCallComp* original() const { return original_; }
 
-  intptr_t receiver_type() const {
-    return receiver_type_;
-  }
+  intptr_t receiver_type() const { return receiver_type_; }
 
   virtual bool CanDeoptimize() const { return true; }
 
  private:
-  const intptr_t token_pos_;
-  const intptr_t try_index_;
   intptr_t receiver_type_;
+  InstanceCallComp* original_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreIndexedComp);
 };
 
 
 // Note overrideable, built-in: value? false : true.
 class BooleanNegateComp : public TemplateComputation<1> {
  public:
   explicit BooleanNegateComp(Value* value) {
     ASSERT(value != NULL);
@@ skipping 1809 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_