Add token kind into InstanceCallComp so that we do not need to extract it from name (addresses vego…

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 426 matching lines @@
     return false;
   }
   ToDoubleComp* coerce = new ToDoubleComp(
       comp->InputAt(0), from_kind, comp);
   coerce->set_instr(comp->instr());
   comp->instr()->replace_computation(coerce);
   return true;
 }
 
 
+
+
 void FlowGraphOptimizer::VisitInstanceCall(InstanceCallComp* comp) {
   if (comp->HasICData() && (comp->ic_data()->NumberOfChecks() > 0)) {
-    const String& function_name = comp->function_name();
-    Token::Kind op_kind = Token::GetBinaryOp(function_name);
-    if ((op_kind != Token::kILLEGAL) && TryReplaceWithBinaryOp(comp, op_kind)) {
+    const Token::Kind op_kind = comp->token_kind();
+    if (Token::IsBinaryToken(op_kind) &&
+        TryReplaceWithBinaryOp(comp, op_kind)) {
       return;
     }
-    op_kind = Token::GetUnaryOp(function_name);
-    if ((op_kind != Token::kILLEGAL) && TryReplaceWithUnaryOp(comp, op_kind)) {
+    if (Token::IsUnaryToken(op_kind) && TryReplaceWithUnaryOp(comp, op_kind)) {
       return;
     }
-    if ((Field::IsGetterName(function_name)) && TryInlineInstanceGetter(comp)) {
+    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) {
       ZoneGrowableArray<intptr_t>* class_ids =
           new ZoneGrowableArray<intptr_t>();
       ZoneGrowableArray<Function*>* targets =
@@ skipping 172 matching lines @@
   instr->computation()->Accept(this);
 }
 
 
 void FlowGraphOptimizer::VisitBind(BindInstr* instr) {
   instr->computation()->Accept(this);
 }
 
 
 }  // namespace dart