Replace InstanceSetterComp instruction with a plain instance call.

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 368 matching lines @@
         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;
     }
+    if ((op_kind == Token::kSET) && TryInlineInstanceSetter(instr, comp)) {
+      return;
+    }
     if (TryInlineInstanceMethod(instr, comp)) {
       return;
     }
     const intptr_t kMaxChecks = 4;
     if (comp->ic_data()->NumberOfChecks() <= kMaxChecks) {
       PolymorphicInstanceCallComp* call = new PolymorphicInstanceCallComp(comp);
       ICData& unary_checks =
           ICData::ZoneHandle(comp->ic_data()->AsUnaryClassChecks());
       call->set_ic_data(&unary_checks);
       instr->set_computation(call);
     }
   }
   // An instance call without ICData should continue calling via IC calls
   // which should trigger reoptimization of optimized code.
 }
 
 
 void FlowGraphOptimizer::VisitStaticCall(StaticCallComp* comp,
                                          BindInstr* instr) {
   MethodRecognizer::Kind recognized_kind =
       MethodRecognizer::RecognizeKind(comp->function());
   if (recognized_kind == MethodRecognizer::kMathSqrt) {
     comp->set_recognized(MethodRecognizer::kMathSqrt);
   }
 }
 
 
 bool FlowGraphOptimizer::TryInlineInstanceSetter(BindInstr* instr,
-                                                 InstanceSetterComp* comp) {
+                                                 InstanceCallComp* comp) {
+  if (FLAG_enable_type_checks) {
+    // TODO(srdjan): Add assignable check node if --enable_type_checks.
+    return false;
+  }
+
   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 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()));
+  const String& field_name =
+      String::Handle(Field::NameFromSetter(comp->function_name()));
+  const Field& field = Field::Handle(GetField(class_id, field_name));
   ASSERT(!field.IsNull());
   StoreInstanceFieldComp* store = new StoreInstanceFieldComp(
       field,
       comp->ArgumentAt(0)->value(),
       comp->ArgumentAt(1)->value(),
       comp);
   store->set_ic_data(comp->ic_data());
   instr->set_computation(store);
-  // Remove original push arguments.
-  for (intptr_t i = 0; i < comp->ArgumentCount(); ++i) {
-    comp->ArgumentAt(i)->RemoveFromGraph();
-  }
+  RemovePushArguments(comp);
   return true;
 }
 
 
-void FlowGraphOptimizer::VisitInstanceSetter(InstanceSetterComp* comp,
-                                             BindInstr* instr) {
-  // TODO(srdjan): Add assignable check node if --enable_type_checks.
-  if (comp->HasICData() && !FLAG_enable_type_checks) {
-    if (TryInlineInstanceSetter(instr, comp)) {
-      return;
-    }
-  }
-  // TODO(srdjan): Polymorphic dispatch to setters or deoptimize.
-}
-
-
 enum IndexedAccessType {
   kIndexedLoad,
   kIndexedStore
 };
 
 
 static intptr_t ReceiverClassId(Computation* comp) {
   if (!comp->HasICData()) return kIllegalObjectKind;
 
   const ICData& ic_data = *comp->ic_data();
@@ skipping 112 matching lines @@
     }
   }
 }
 
 
 void FlowGraphTypePropagator::PropagateTypes() {
   VisitBlocks();
 }
 
 }  // namespace dart