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

vm/flow_graph_optimizer.cc

 // 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.
 
 #include "vm/flow_graph_optimizer.h"
 
 #include "vm/flow_graph_builder.h"
 #include "vm/il_printer.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
@@ skipping 133 matching lines @@
 
 
 static void RemovePushArguments(InstanceCallComp* comp) {
   // Remove original push arguments.
   for (intptr_t i = 0; i < comp->ArgumentCount(); ++i) {
     comp->ArgumentAt(i)->RemoveFromGraph();
   }
 }
 
 
+// Returns true if all targets are the same.
+// TODO(srdjan): if targets are native use their C_function to compare.
+static bool HasOneTarget(const ICData& ic_data) {
+  ASSERT(ic_data.NumberOfChecks() > 0);
+  const Function& first_target = Function::Handle(ic_data.GetTargetAt(0));
+  Function& test_target = Function::Handle();
+  for (intptr_t i = 1; i < ic_data.NumberOfChecks(); i++) {
+    test_target = ic_data.GetTargetAt(i);
+    if (first_target.raw() != test_target.raw()) {
+      return false;
+    }
+  }
+  return true;
+}
+
+
+static intptr_t ReceiverClassId(Computation* comp) {
+  if (!comp->HasICData()) return kIllegalCid;
+
+  const ICData& ic_data = *comp->ic_data();
+
+  if (ic_data.NumberOfChecks() == 0) return kIllegalCid;
+  // TODO(vegorov): Add multiple receiver type support.
+  if (ic_data.NumberOfChecks() != 1) return kIllegalCid;
+  ASSERT(HasOneTarget(ic_data));
+
+  Function& target = Function::Handle();
+  intptr_t class_id;
+  ic_data.GetOneClassCheckAt(0, &class_id, &target);
+  return class_id;
+}
+
+
+bool FlowGraphOptimizer::TryReplaceWithArrayOp(BindInstr* instr,
+                                               InstanceCallComp* comp,
+                                               Token::Kind op_kind) {
+  // TODO(fschneider): Optimize []= operator in checked mode as well.
+  if (op_kind == Token::kASSIGN_INDEX && FLAG_enable_type_checks) return false;
+
+  const intptr_t class_id = ReceiverClassId(comp);
+  switch (class_id) {
+    case kArrayCid:
+    case kImmutableArrayCid:

[Vyacheslav Egorov (Google), 2012/08/15 13:16:09]

I don't think StoreIndexedComp correctly handles store into immutable array.
VisitStoreIndexed did not specialize for it.

[Florian Schneider, 2012/08/15 13:53:51]

Thanks for the catch. Done.

+    case kGrowableObjectArrayCid: {
+      Computation* array_op = NULL;
+      if (op_kind == Token::kINDEX) {
+          array_op = new LoadIndexedComp(comp->ArgumentAt(0)->value(),
+                                         comp->ArgumentAt(1)->value(),
+                                         class_id,
+                                         comp);
+      } else {
+          array_op = new StoreIndexedComp(comp->ArgumentAt(0)->value(),
+                                          comp->ArgumentAt(1)->value(),
+                                          comp->ArgumentAt(2)->value(),
+                                          class_id,
+                                          comp);
+      }
+      array_op->set_ic_data(comp->ic_data());
+      instr->set_computation(array_op);
+      RemovePushArguments(comp);
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+
+
 bool FlowGraphOptimizer::TryReplaceWithBinaryOp(BindInstr* instr,
                                                 InstanceCallComp* comp,
                                                 Token::Kind op_kind) {
   BinaryOpComp::OperandsType operands_type = BinaryOpComp::kDynamicOperands;
   ASSERT(comp->HasICData());
   const ICData& ic_data = *comp->ic_data();
   switch (op_kind) {
     case Token::kADD:
     case Token::kSUB:
     case Token::kMUL:
@@ skipping 74 matching lines @@
   }
   if (unary_op == NULL) return false;
 
   unary_op->set_ic_data(comp->ic_data());
   instr->set_computation(unary_op);
   RemovePushArguments(comp);
   return true;
 }
 
 
-// Returns true if all targets are the same.
-// TODO(srdjan): if targets are native use their C_function to compare.
-static bool HasOneTarget(const ICData& ic_data) {
-  ASSERT(ic_data.NumberOfChecks() > 0);
-  const Function& first_target = Function::Handle(ic_data.GetTargetAt(0));
-  Function& test_target = Function::Handle();
-  for (intptr_t i = 1; i < ic_data.NumberOfChecks(); i++) {
-    test_target = ic_data.GetTargetAt(i);
-    if (first_target.raw() != test_target.raw()) {
-      return false;
-    }
-  }
-  return true;
-}
-
-
 // Using field class
 static RawField* GetField(intptr_t class_id, const String& field_name) {
   Class& cls = Class::Handle(Isolate::Current()->class_table()->At(class_id));
   Field& field = Field::Handle();
   while (!cls.IsNull()) {
     field = cls.LookupInstanceField(field_name);
     if (!field.IsNull()) {
       return field.raw();
     }
     cls = cls.SuperClass();
@@ skipping 121 matching lines @@
   instr->set_computation(coerce);
   RemovePushArguments(comp);
   return true;
 }
 
 
 void FlowGraphOptimizer::VisitInstanceCall(InstanceCallComp* comp,
                                            BindInstr* instr) {
   if (comp->HasICData() && (comp->ic_data()->NumberOfChecks() > 0)) {
     const Token::Kind op_kind = comp->token_kind();
+    if (Token::IsIndexOperator(op_kind) &&
+        TryReplaceWithArrayOp(instr, comp, op_kind)) {
+      return;
+    }
     if (Token::IsBinaryToken(op_kind) &&
         TryReplaceWithBinaryOp(instr, comp, op_kind)) {
       return;
     }
     if (Token::IsUnaryToken(op_kind) &&
         TryReplaceWithUnaryOp(instr, comp, op_kind)) {
       return;
     }
     if ((op_kind == Token::kGET) && TryInlineInstanceGetter(instr, comp)) {
       return;
@@ skipping 63 matching lines @@
       comp->ArgumentAt(0)->value(),
       comp->ArgumentAt(1)->value(),
       comp);
   store->set_ic_data(comp->ic_data());
   instr->set_computation(store);
   RemovePushArguments(comp);
   return true;
 }
 
 
-enum IndexedAccessType {
-  kIndexedLoad,
-  kIndexedStore
-};
-
-
-static intptr_t ReceiverClassId(Computation* comp) {
-  if (!comp->HasICData()) return kIllegalCid;
-
-  const ICData& ic_data = *comp->ic_data();
-
-  if (ic_data.NumberOfChecks() == 0) return kIllegalCid;
-  // TODO(vegorov): Add multiple receiver type support.
-  if (ic_data.NumberOfChecks() != 1) return kIllegalCid;
-  ASSERT(HasOneTarget(ic_data));
-
-  Function& target = Function::Handle();
-  intptr_t class_id;
-  ic_data.GetOneClassCheckAt(0, &class_id, &target);
-  return class_id;
-}
-
-
-void FlowGraphOptimizer::VisitLoadIndexed(LoadIndexedComp* comp,
-                                          BindInstr* instr) {
-  const intptr_t class_id = ReceiverClassId(comp);
-  switch (class_id) {
-    case kArrayCid:
-    case kImmutableArrayCid:
-    case kGrowableObjectArrayCid:
-      comp->set_receiver_type(class_id);
-  }
-}
-
-
-void FlowGraphOptimizer::VisitStoreIndexed(StoreIndexedComp* comp,
-                                           BindInstr* instr) {
-  if (FLAG_enable_type_checks) return;
-
-  const intptr_t class_id = ReceiverClassId(comp);
-  switch (class_id) {
-    case kArrayCid:
-    case kGrowableObjectArrayCid:
-      comp->set_receiver_type(class_id);
-  }
-}
-
-
 void FlowGraphOptimizer::VisitRelationalOp(RelationalOpComp* comp,
                                            BindInstr* instr) {
   if (!comp->HasICData()) return;
 
   const ICData& ic_data = *comp->ic_data();
   if (ic_data.NumberOfChecks() == 0) return;
   // TODO(srdjan): Add multiple receiver type support.
   if (ic_data.NumberOfChecks() != 1) return;
   ASSERT(HasOneTarget(ic_data));
 
@@ skipping 172 matching lines @@
       LocationSummary* locs = it.Current()->locs();
       if ((locs != NULL) && locs->is_call()) {
         is_leaf_ = false;
         return;
       }
     }
   }
 }
 
 }  // namespace dart