Do not issue Mint/Smi code sequence if we have only Smi/Smi comnbination.

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 114 matching lines @@
 
 
 static bool HasTwoDouble(const ICData& ic_data) {
   return ICDataHasReceiverArgumentClassIds(ic_data, kDouble, kDouble);
 }
 
 
 bool FlowGraphOptimizer::TryReplaceWithBinaryOp(InstanceCallComp* comp,
                                                 Token::Kind op_kind) {
   BinaryOpComp::OperandsType operands_type;
-  if ((op_kind == Token::kBIT_AND) && HasTwoMintOrSmi(*comp->ic_data())) {
-    operands_type = BinaryOpComp::kMintOperands;
-  } else if (comp->ic_data()->NumberOfChecks() != 1) {
-    // TODO(srdjan): Not yet supported.
-    return false;
-  } else if (HasTwoSmi(*comp->ic_data())) {
+  if ((comp->ic_data()->NumberOfChecks() == 1) && HasTwoSmi(*comp->ic_data())) {
     if (op_kind == Token::kDIV ||
         op_kind == Token::kMOD) {
       // TODO(srdjan): Not yet supported.
       return false;

[regis, 2012/06/22 20:09:03]

With this change, you will not inline kBIT_AND with 2 Smis anymore.

I think that this whole function should be rewritten as a switch (op_kind).

[srdjan, 2012/06/22 20:36:47]

As discussed, the code is correct but complicated. Modified as suggested.

     }
     operands_type = BinaryOpComp::kSmiOperands;
+  } else if ((op_kind == Token::kBIT_AND) &&
+             HasTwoMintOrSmi(*comp->ic_data())) {
+    operands_type = BinaryOpComp::kMintOperands;
+  } else if (comp->ic_data()->NumberOfChecks() != 1) {
+    // TODO(srdjan): Not yet supported.
+    return false;
   } else if (HasTwoDouble(*comp->ic_data())) {
     if (op_kind != Token::kADD &&
         op_kind != Token::kSUB &&
         op_kind != Token::kMUL &&
         op_kind != Token::kDIV) {
       // TODO(vegorov): Not yet supported.
       return false;
     }
     operands_type = BinaryOpComp::kDoubleOperands;
   } else {
@@ skipping 430 matching lines @@
   instr->computation()->Accept(this);
 }
 
 
 void FlowGraphOptimizer::VisitBind(BindInstr* instr) {
   instr->computation()->Accept(this);
 }
 
 
 }  // namespace dart