Factor out code for insertin class checks.

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 176 matching lines @@
   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;
 }
 
 
+static void 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);
+  BindInstr* check_instr = new BindInstr(BindInstr::kUnused, check);
+  ASSERT(instr->env() != NULL);  // Always the case with SSA.
+  // Attach the original environment to the check instruction.
+  check_instr->set_env(instr->env());
+  check_instr->InsertBefore(instr);
+}
+
+
 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: {
       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(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 = 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;
   }
 }
@@ skipping 125 matching lines @@
   if (target.kind() == RawFunction::kImplicitGetter) {
     if (!HasOneTarget(ic_data)) {
       // 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());
-
-    // Type propagation has not run yet, we cannot eliminate the check.
-    CheckClassComp* check =
-        new CheckClassComp(comp->ArgumentAt(0)->value(), comp);
-    const ICData& unary_checks =
-        ICData::ZoneHandle(comp->ic_data()->AsUnaryClassChecks());
-    check->set_ic_data(&unary_checks);
-    BindInstr* check_instr = new BindInstr(BindInstr::kUnused, check);
-    ASSERT(instr->env() != NULL);  // Always the case with SSA.
-    // Attach the original environment to the check instruction.
-    check_instr->set_env(instr->env());
+    AddCheckClass(instr, comp, comp->ArgumentAt(0)->value());
     instr->set_env(NULL);
-    check_instr->InsertBefore(instr);
     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 159 matching lines @@
     // Not an implicit setter.
     // 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());
 
-  // Type propagation has not run yet, we cannot eliminate the check.
-  CheckClassComp* check =
-      new CheckClassComp(comp->ArgumentAt(0)->value(), comp);
-  const ICData& unary_checks =
-      ICData::ZoneHandle(comp->ic_data()->AsUnaryClassChecks());
-  check->set_ic_data(&unary_checks);
-  BindInstr* check_instr = new BindInstr(BindInstr::kUnused, check);
-  ASSERT(instr->env() != NULL);  // Always the case with SSA.
-  // Attach the original environment to the check instruction.
-  check_instr->set_env(instr->env());
+  AddCheckClass(instr, comp, comp->ArgumentAt(0)->value());
   instr->set_env(NULL);
-  check_instr->InsertBefore(instr);
   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 366 matching lines @@
         OS::Print("Replacing v%d with v%d\n",
                   instr->ssa_temp_index(),
                   result->ssa_temp_index());
       }
     }
   }
 }
 
 
 }  // namespace dart