Add explicit smi-checks to smi comparisons.

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/cha.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/hash_map.h"
 #include "vm/il_printer.h"
@@ skipping 208 matching lines @@
       if (op_kind == Token::kASSIGN_INDEX) return false;
       // Fall through.
     case kArrayCid:
     case kGrowableObjectArrayCid: {
       Value* array = comp->ArgumentAt(0)->value();
       Value* index = comp->ArgumentAt(1)->value();
       // Insert class check and index smi checks and attach a copy of the
       // original environment because the operation can still deoptimize.
       AddCheckClass(instr, comp, array->Copy());
       InsertBefore(instr,
-                   new CheckSmiComp(index->Copy(), comp),
+                   new CheckSmiComp(index->Copy(), comp->deopt_id()),
                    instr->env(),
                    BindInstr::kUnused);
       // Insert array bounds check.
       InsertBefore(instr,
                    new CheckArrayBoundComp(array->Copy(),
                                            index->Copy(),
                                            class_id,
                                            comp),
                    instr->env(),
                    BindInstr::kUnused);
@@ skipping 150 matching lines @@
     bin_op->set_ic_data(comp->ic_data());
     instr->set_computation(bin_op);
     RemovePushArguments(comp);
   } else {
     ASSERT(operands_type == kSmiCid);
     Value* left = comp->ArgumentAt(0)->value();
     Value* right = comp->ArgumentAt(1)->value();
     // Insert two smi checks and attach a copy of the original
     // environment because the smi operation can still deoptimize.
     InsertBefore(instr,
-                 new CheckSmiComp(left->Copy(), comp),
+                 new CheckSmiComp(left->Copy(), comp->deopt_id()),
                  instr->env(),
                  BindInstr::kUnused);
     InsertBefore(instr,
-                 new CheckSmiComp(right->Copy(), comp),
+                 new CheckSmiComp(right->Copy(), comp->deopt_id()),
                  instr->env(),
                  BindInstr::kUnused);
     BinarySmiOpComp* bin_op = new BinarySmiOpComp(op_kind,
                                                   comp,
                                                   left,
                                                   right);
     bin_op->set_ic_data(comp->ic_data());
     instr->set_computation(bin_op);
     RemovePushArguments(comp);
   }
   return true;
 }
 
 
 bool FlowGraphOptimizer::TryReplaceWithUnaryOp(BindInstr* instr,
                                                InstanceCallComp* comp,
                                                Token::Kind op_kind) {
   if (comp->ic_data()->NumberOfChecks() != 1) {
     // TODO(srdjan): Not yet supported.
     return false;
   }
   ASSERT(comp->ArgumentCount() == 1);
   Computation* unary_op = NULL;
   if (HasOneSmi(*comp->ic_data())) {
     Value* value = comp->ArgumentAt(0)->value();
     InsertBefore(instr,
-                 new CheckSmiComp(value->Copy(), comp),
+                 new CheckSmiComp(value->Copy(), comp->deopt_id()),
                  instr->env(),
                  BindInstr::kUnused);
     unary_op = new UnarySmiOpComp(op_kind,
                                   (op_kind == Token::kNEGATE) ? comp : NULL,
                                   value);
   } else if (HasOneDouble(*comp->ic_data()) && (op_kind == Token::kNEGATE)) {
     unary_op = new NumberNegateComp(comp, comp->ArgumentAt(0)->value());
   }
   if (unary_op == NULL) return false;
 
@@ skipping 247 matching lines @@
   StoreInstanceFieldComp* store = new StoreInstanceFieldComp(
       field,
       comp->ArgumentAt(0)->value(),
       comp->ArgumentAt(1)->value());
   instr->set_computation(store);
   RemovePushArguments(comp);
   return true;
 }
 
 
-void FlowGraphOptimizer::VisitRelationalOp(RelationalOpComp* comp,
-                                           BindInstr* instr) {
+// TODO(fschneider): Once we get rid of the distinction between Instruction
+// and computation, this helper can go away.
+static void HandleRelationalOp(FlowGraphOptimizer* optimizer,
+                               RelationalOpComp* comp,
+                               Instruction* instr) {
   if (!comp->HasICData()) return;
 
   const ICData& ic_data = *comp->ic_data();
   if (ic_data.NumberOfChecks() == 0) return;
   // TODO(srdjan): Add multiple receiver type support.
   if (ic_data.NumberOfChecks() != 1) return;
   ASSERT(HasOneTarget(ic_data));
 
   if (HasOnlyTwoSmi(ic_data)) {
+    optimizer->InsertBefore(
+        instr,
+        new CheckSmiComp(comp->left()->Copy(), comp->deopt_id()),
+        instr->env(),
+        BindInstr::kUnused);
+    optimizer->InsertBefore(
+        instr,
+        new CheckSmiComp(comp->right()->Copy(), comp->deopt_id()),
+        instr->env(),
+        BindInstr::kUnused);
     comp->set_operands_class_id(kSmiCid);
   } else if (HasOnlyTwoDouble(ic_data)) {
     comp->set_operands_class_id(kDoubleCid);
   } else if (comp->ic_data()->AllReceiversAreNumbers()) {
     comp->set_operands_class_id(kNumberCid);
   }
 }
 
+void FlowGraphOptimizer::VisitRelationalOp(RelationalOpComp* comp,
+                                           BindInstr* instr) {
+  HandleRelationalOp(this, comp, instr);
+}
 
-void FlowGraphOptimizer::VisitEqualityCompare(EqualityCompareComp* comp,
-                                              BindInstr* instr) {
+
+// TODO(fschneider): Once we get rid of the distinction between Instruction
+// and computation, this helper can go away.
+template <typename T>
+static void HandleEqualityCompare(FlowGraphOptimizer* optimizer,
+                                  EqualityCompareComp* comp,
+                                  T instr) {
   // If one of the inputs is null, no ICdata will be collected.
   if (comp->left()->BindsToConstantNull() ||
       comp->right()->BindsToConstantNull()) {
     Token::Kind strict_kind = (comp->kind() == Token::kEQ) ?
         Token::kEQ_STRICT : Token::kNE_STRICT;
     StrictCompareComp* strict_comp =
         new StrictCompareComp(strict_kind, comp->left(), comp->right());
     instr->set_computation(strict_comp);
     return;
   }
   if (!comp->HasICData() || (comp->ic_data()->NumberOfChecks() == 0)) return;
   if (comp->ic_data()->NumberOfChecks() == 1) {
     ASSERT(comp->ic_data()->num_args_tested() == 2);
     GrowableArray<intptr_t> class_ids;
     Function& target = Function::Handle();
     comp->ic_data()->GetCheckAt(0, &class_ids, &target);
     // TODO(srdjan): allow for mixed mode comparison.
     if ((class_ids[0] == kSmiCid) && (class_ids[1] == kSmiCid)) {
+      optimizer->InsertBefore(
+          instr,
+          new CheckSmiComp(comp->left()->Copy(), comp->deopt_id()),
+          instr->env(),
+          BindInstr::kUnused);
+      optimizer->InsertBefore(
+          instr,
+          new CheckSmiComp(comp->right()->Copy(), comp->deopt_id()),
+          instr->env(),
+          BindInstr::kUnused);
       comp->set_receiver_class_id(kSmiCid);
     } else if ((class_ids[0] == kDoubleCid) && (class_ids[1] == kDoubleCid)) {
       comp->set_receiver_class_id(kDoubleCid);
     } else {
       ASSERT(comp->receiver_class_id() == kIllegalCid);
     }
   } else if (comp->ic_data()->AllReceiversAreNumbers()) {
     comp->set_receiver_class_id(kNumberCid);
   }
 }
 
 
+void FlowGraphOptimizer::VisitEqualityCompare(EqualityCompareComp* comp,
+                                              BindInstr* instr) {
+  HandleEqualityCompare(this, comp, instr);
+}
+
+
 void FlowGraphOptimizer::VisitBind(BindInstr* instr) {
   instr->computation()->Accept(this, instr);
 }
 
 
 void FlowGraphOptimizer::VisitBranch(BranchInstr* instr) {
-  instr->computation()->Accept(this, NULL);
+  ComparisonComp* comparison = instr->computation();
+  if (comparison->IsRelationalOp()) {
+    HandleRelationalOp(this, comparison->AsRelationalOp(), instr);
+  } else if (comparison->IsEqualityCompare()) {
+    HandleEqualityCompare(this, comparison->AsEqualityCompare(), instr);
+  } else {
+    ASSERT(comparison->IsStrictCompare());
+    // Nothing to do.
+  }
 }
 
 
 void FlowGraphTypePropagator::VisitAssertAssignable(AssertAssignableComp* comp,
                                                     BindInstr* instr) {
   if (FLAG_eliminate_type_checks &&
       !comp->is_eliminated() &&
       comp->value()->CompileTypeIsMoreSpecificThan(comp->dst_type())) {
     // TODO(regis): Remove is_eliminated_ field and support.
     comp->eliminate();
@@ skipping 298 matching lines @@
       DirectChainedHashMap<BindInstr*> child_map(*map);  // Copy map.
       OptimizeRecursive(child, &child_map);
     } else {
       OptimizeRecursive(child, map);  // Reuse map for the last child.
     }
   }
 }
 
 
 }  // namespace dart