Removing more IC calls in optimized code.

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/flow_graph_builder.h"
 #include "vm/il_printer.h"
 #include "vm/object_store.h"
 
@@ skipping 353 matching lines @@
     if (Token::IsUnaryToken(op_kind) && TryReplaceWithUnaryOp(comp, op_kind)) {
       return;
     }
     if ((op_kind == Token::kGET) && TryInlineInstanceGetter(comp)) {
       return;
     }
     if (TryInlineInstanceMethod(comp)) {
       return;
     }
     const intptr_t kMaxChecks = 4;
-    if (comp->ic_data()->num_args_tested() <= kMaxChecks) {
+    if (comp->ic_data()->NumberOfChecks() <= kMaxChecks) {
       PolymorphicInstanceCallComp* call = new PolymorphicInstanceCallComp(comp);
       ICData& unary_checks =
-          ICData::Handle(ToUnaryClassChecks(*comp->ic_data()));
+          ICData::ZoneHandle(ToUnaryClassChecks(*comp->ic_data()));
       call->set_ic_data(&unary_checks);
       comp->ReplaceWith(call);
     }
+  } else {
+    // Mark it for deopt.
+    PolymorphicInstanceCallComp* call = new PolymorphicInstanceCallComp(comp);
+    call->set_ic_data(&ICData::ZoneHandle());
+    comp->ReplaceWith(call);
   }
 }
 
 
 void FlowGraphOptimizer::VisitStaticCall(StaticCallComp* comp) {
   MethodRecognizer::Kind recognized_kind =
       MethodRecognizer::RecognizeKind(comp->function());
   if (recognized_kind == MethodRecognizer::kMathSqrt) {
     comp->set_recognized(MethodRecognizer::kMathSqrt);
   }
 }
 
 
 bool FlowGraphOptimizer::TryInlineInstanceSetter(InstanceSetterComp* comp) {
   ASSERT(comp->HasICData());
   const ICData& ic_data = *comp->ic_data();
   if (ic_data.NumberOfChecks() == 0) {
     // No type feedback collected.
     return false;
   }
   if (!HasOneTarget(ic_data)) {
-    // TODO(srdjan): Implement when not all targets are the sa,e.
+    // TODO(srdjan): Implement when not all targets are the same.
     return false;
   }
   Function& target = Function::Handle();
   intptr_t class_id;
   ic_data.GetOneClassCheckAt(0, &class_id, &target);
   if (target.kind() != RawFunction::kImplicitSetter) {
     // Not an implicit setter.
     // TODO(srdjan): Inline special setters.
     return false;
   }
   // Inline implicit instance setter.
   const Field& field = Field::Handle(GetField(class_id, comp->field_name()));
   ASSERT(!field.IsNull());
   StoreInstanceFieldComp* store = new StoreInstanceFieldComp(
       field,
       comp->InputAt(0),
       comp->InputAt(1),
       comp);
   store->set_ic_data(comp->ic_data());
   comp->ReplaceWith(store);
   return true;
 }
 
 
 
 void FlowGraphOptimizer::VisitInstanceSetter(InstanceSetterComp* comp) {
-  // TODO(srdjan): Add assigneable check node if --enable_type_checks.
+  // TODO(srdjan): Add assignable check node if --enable_type_checks.
   if (comp->HasICData() && !FLAG_enable_type_checks) {
-    TryInlineInstanceSetter(comp);
+    if (TryInlineInstanceSetter(comp)) {
+      return;
+    }
   }
+  // TODO(srdjan): Polymorphic dispatch to setters or deoptimize.
 }
 
 
 enum IndexedAccessType {
   kIndexedLoad,
   kIndexedStore
 };
 
 
 static intptr_t ReceiverClassId(Computation* comp) {
@@ skipping 92 matching lines @@
   TryFuseComparisonWithBranch(comp);
 }
 
 
 void FlowGraphOptimizer::VisitStrictCompareComp(StrictCompareComp* comp) {
   TryFuseComparisonWithBranch(comp);
 }
 
 
 void FlowGraphOptimizer::VisitEqualityCompare(EqualityCompareComp* comp) {
-  const intptr_t kMaxChecks = 4;
-  if (comp->HasICData() && (comp->ic_data()->num_args_tested() <= kMaxChecks)) {
-    // Replace binary checks with unary ones.
+  if (comp->HasICData()) {
+    // Replace binary checks with unary ones since EmitNative expects it.
     ICData& unary_checks =
         ICData::Handle(ToUnaryClassChecks(*comp->ic_data()));
     comp->set_ic_data(&unary_checks);
   }
 
   TryFuseComparisonWithBranch(comp);
 }
 
 
 void FlowGraphOptimizer::VisitDo(DoInstr* instr) {
   instr->computation()->Accept(this);
 }
 
 
 void FlowGraphOptimizer::VisitBind(BindInstr* instr) {
   instr->computation()->Accept(this);
 }
 
 
 }  // namespace dart