Check class instruction supports Smi check. This fixes missed inlining of isOdd/isEven

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/bit_vector.h"
 #include "vm/cha.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/flow_graph_compiler.h"
@@ skipping 409 matching lines @@
   ic_data.GetOneClassCheckAt(0, &class_id, &target);
   return class_id;
 }
 
 
 void FlowGraphOptimizer::AddCheckClass(InstanceCallInstr* call,
                                        Value* value) {
   // Type propagation has not run yet, we cannot eliminate the check.
   const ICData& unary_checks =
       ICData::ZoneHandle(call->ic_data()->AsUnaryClassChecks());
-  CheckClassInstr* check =
-      new CheckClassInstr(value, call->deopt_id(), unary_checks);
+  Instruction* check = NULL;
+  if ((unary_checks.NumberOfChecks() == 1) &&
+      (unary_checks.GetReceiverClassIdAt(0) == kSmiCid)) {
+    check = new CheckSmiInstr(value, call->deopt_id());
+  } else {
+    check = new CheckClassInstr(value, call->deopt_id(), unary_checks);
+  }
   InsertBefore(call, check, call->env(), Definition::kEffect);
 }
 
 
 static bool ArgIsAlwaysSmi(const ICData& ic_data, intptr_t arg_n) {
   ASSERT(ic_data.num_args_tested() > arg_n);
   if (ic_data.NumberOfChecks() == 0) return false;
   GrowableArray<intptr_t> class_ids;
   Function& target = Function::Handle();
   for (intptr_t i = 0; i < ic_data.NumberOfChecks(); i++) {
@@ skipping 42 matching lines @@
     InsertBefore(call, elements, NULL, Definition::kValue);
     *array = new Value(elements);
     return kArrayCid;
   }
   return class_id;
 }
 
 
 bool FlowGraphOptimizer::TryReplaceWithStoreIndexed(InstanceCallInstr* call) {
   const intptr_t class_id = ReceiverClassId(call);
-  ICData& value_check = ICData::Handle();
+  ICData& value_check = ICData::ZoneHandle();
   switch (class_id) {
     case kArrayCid:
     case kGrowableObjectArrayCid:
       // Acceptable store index classes.
       break;
     case kFloat32ArrayCid:
     case kFloat64ArrayCid: {
       // Check that value is always double.
       value_check = call->ic_data()->AsUnaryClassChecksForArgNr(2);
       if ((value_check.NumberOfChecks() != 1) ||
@@ skipping 634 matching lines @@
       const bool call_with_checks = false;
       PolymorphicInstanceCallInstr* call =
           new PolymorphicInstanceCallInstr(instr, unary_checks,
                                            call_with_checks);
       instr->ReplaceWith(call, current_iterator());
       return;
     }
     const intptr_t kMaxChecks = 4;
     if (instr->ic_data()->NumberOfChecks() <= kMaxChecks) {
       bool call_with_checks;
-      // TODO(srdjan): Add check class instr for mixed smi/non-smi.
-      if (unary_checks.HasOneTarget() &&
-          (unary_checks.GetReceiverClassIdAt(0) != kSmiCid)) {
+      if (unary_checks.HasOneTarget()) {
         // Type propagation has not run yet, we cannot eliminate the check.
         AddCheckClass(instr, instr->ArgumentAt(0)->value()->Copy());
         // Call can still deoptimize, do not detach environment from instr.
         call_with_checks = false;
       } else {
         call_with_checks = true;
       }
       PolymorphicInstanceCallInstr* call =
           new PolymorphicInstanceCallInstr(instr, unary_checks,
                                            call_with_checks);
@@ skipping 170 matching lines @@
 
   // Check if ICDData contains checks with Smi/Null combinations. In that case
   // we can still emit the optimized Smi equality operation but need to add
   // checks for null or Smi.
   // TODO(srdjan): Add it for Double and Mint.
   GrowableArray<intptr_t> smi_or_null(2);
   smi_or_null.Add(kSmiCid);
   smi_or_null.Add(kNullCid);
   if (ICDataHasOnlyReceiverArgumentClassIds(
         *comp->ic_data(), smi_or_null, smi_or_null)) {
-    ICData& unary_checks =
+    const ICData& unary_checks_0 =
         ICData::ZoneHandle(comp->ic_data()->AsUnaryClassChecks());
     const intptr_t deopt_id = comp->deopt_id();
-    if ((unary_checks.NumberOfChecks() == 1) &&
-        (unary_checks.GetReceiverClassIdAt(0) == kSmiCid)) {
+    if ((unary_checks_0.NumberOfChecks() == 1) &&
+        (unary_checks_0.GetReceiverClassIdAt(0) == kSmiCid)) {
       // Smi only.
       optimizer->InsertBefore(
         instr,
         new CheckSmiInstr(comp->left()->Copy(), deopt_id),
         instr->env(),
         Definition::kEffect);
     } else {
       // Smi or NULL.
       optimizer->InsertBefore(
         instr,
-        new CheckClassInstr(comp->left()->Copy(), deopt_id, unary_checks),
+        new CheckClassInstr(comp->left()->Copy(), deopt_id, unary_checks_0),
         instr->env(),
         Definition::kEffect);
     }
 
-    unary_checks = comp->ic_data()->AsUnaryClassChecksForArgNr(1);
-    if ((unary_checks.NumberOfChecks() == 1) &&
-        (unary_checks.GetReceiverClassIdAt(0) == kSmiCid)) {
+    const ICData& unary_checks_1 =
+        ICData::ZoneHandle(comp->ic_data()->AsUnaryClassChecksForArgNr(1));
+    if ((unary_checks_1.NumberOfChecks() == 1) &&
+        (unary_checks_1.GetReceiverClassIdAt(0) == kSmiCid)) {
       // Smi only.
       optimizer->InsertBefore(
         instr,
         new CheckSmiInstr(comp->right()->Copy(), deopt_id),
         instr->env(),
         Definition::kEffect);
     } else {
       // Smi or NULL.
       optimizer->InsertBefore(
         instr,
-        new CheckClassInstr(comp->right()->Copy(), deopt_id, unary_checks),
+        new CheckClassInstr(comp->right()->Copy(), deopt_id, unary_checks_1),
         instr->env(),
         Definition::kEffect);
     }
     comp->set_receiver_class_id(kSmiCid);
   }
 }
 
 
 void FlowGraphOptimizer::VisitEqualityCompare(EqualityCompareInstr* instr) {
   HandleEqualityCompare(this, instr, instr, current_iterator());
@@ skipping 2118 matching lines @@
 
   if (FLAG_trace_constant_propagation) {
     OS::Print("\n==== After constant propagation ====\n");
     FlowGraphPrinter printer(*graph_);
     printer.PrintBlocks();
   }
 }
 
 
 }  // namespace dart