Split class and smi check from array operations.

runtime/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/cha.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/hash_map.h"
 #include "vm/il_printer.h"
@@ skipping 184 matching lines @@
 
 void FlowGraphOptimizer::AddCheckClass(BindInstr* instr,
                                        InstanceCallComp* comp,
                                        Value* value) {
   // Type propagation has not run yet, we cannot eliminate the check.
   CheckClassComp* check = new CheckClassComp(value, comp);
   const ICData& unary_checks =
       ICData::ZoneHandle(comp->ic_data()->AsUnaryClassChecks());
   check->set_ic_data(&unary_checks);
   InsertBefore(instr, check, instr->env(), BindInstr::kUnused);
-  // Detach environment from the original instruction because it can't
-  // deoptimize.
-  instr->set_env(NULL);
 }
 
 
 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 kImmutableArrayCid:
       // Stores are only specialized for Array and GrowableObjectArray,
       // not for ImmutableArray.
       if (op_kind == Token::kASSIGN_INDEX) return false;
       // Fall through.
     case kArrayCid:
     case kGrowableObjectArrayCid: {
+      Value* array = comp->ArgumentAt(0)->value();
+      Value* index = comp->ArgumentAt(1)->value();
+      // Insert class check and index smi checks and attach a copy of the
+      // original environment because the operation can still deoptimize.
+      AddCheckClass(instr, comp, array->CopyValue());
+      InsertBefore(instr,
+                   new CheckSmiComp(index->CopyValue(), comp),
+                   instr->env(),
+                   BindInstr::kUnused);
       Computation* array_op = NULL;
       if (op_kind == Token::kINDEX) {
-        array_op = new LoadIndexedComp(comp->ArgumentAt(0)->value(),
-                                       comp->ArgumentAt(1)->value(),
-                                       class_id,
-                                       comp);
+        array_op = new LoadIndexedComp(array, index, class_id, comp);
       } else {
-        array_op = new StoreIndexedComp(comp->ArgumentAt(0)->value(),
-                                        comp->ArgumentAt(1)->value(),
-                                        comp->ArgumentAt(2)->value(),
-                                        class_id,
-                                        comp);
+        Value* value = comp->ArgumentAt(2)->value();
+        array_op = new StoreIndexedComp(array, index, value, class_id, comp);
       }
       array_op->set_ic_data(comp->ic_data());
       instr->set_computation(array_op);
       RemovePushArguments(comp);
       return true;
     }
     default:
       return false;
   }
 }
@@ skipping 217 matching lines @@
       // TODO(srdjan): Implement for mutiple targets.
       return false;
     }
     // Inline implicit instance getter.
     const String& field_name =
         String::Handle(Field::NameFromGetter(comp->function_name()));
     const Field& field = Field::Handle(GetField(class_ids[0], field_name));
     ASSERT(!field.IsNull());
 
     AddCheckClass(instr, comp, comp->ArgumentAt(0)->value()->CopyValue());
+    // Detach environment from the original instruction because it can't
+    // deoptimize.
+    instr->set_env(NULL);
     LoadInstanceFieldComp* load =
         new LoadInstanceFieldComp(field,
                                   comp->ArgumentAt(0)->value(),
                                   NULL);  // Can not deoptimize.
     instr->set_computation(load);
     RemovePushArguments(comp);
     return true;
   }
 
   // Not an implicit getter.
@@ skipping 177 matching lines @@
     // TODO(srdjan): Inline special setters.
     return false;
   }
   // Inline implicit instance setter.
   const String& field_name =
       String::Handle(Field::NameFromSetter(comp->function_name()));
   const Field& field = Field::Handle(GetField(class_id, field_name));
   ASSERT(!field.IsNull());
 
   AddCheckClass(instr, comp, comp->ArgumentAt(0)->value()->CopyValue());
+  // Detach environment from the original instruction because it can't
+  // deoptimize.
+  instr->set_env(NULL);
   StoreInstanceFieldComp* store = new StoreInstanceFieldComp(
       field,
       comp->ArgumentAt(0)->value(),
       comp->ArgumentAt(1)->value(),
       NULL);  // Can not deoptimize.
   instr->set_computation(store);
   RemovePushArguments(comp);
   return true;
 }
 
@@ skipping 367 matching lines @@
       DirectChainedHashMap<BindInstr*> child_map(*map);  // Copy map.
       OptimizeRecursive(child, &child_map);
     } else {
       OptimizeRecursive(child, map);  // Reuse map for the last child.
     }
   }
 }
 
 
 }  // namespace dart