Fix ConstantPropagator::VisitBinaryDoubleOp to work with all integer types.

runtime/vm/flow_graph_optimizer.cc

 // Copyright (c) 2013, 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/cpu.h"
 #include "vm/dart_entry.h"
@@ skipping 8487 matching lines @@
   UNREACHABLE();
 }
 
 
 void ConstantPropagator::VisitMaterializeObject(MaterializeObjectInstr* instr) {
   // Should not be used outside of allocation elimination pass.
   UNREACHABLE();
 }
 
 
+static bool IsIntegerOrDouble(const Object& value) {
+  return value.IsInteger() || value.IsDouble();
+}
+
+
+static double ToDouble(const Object& value) {
+  return value.IsInteger() ? Integer::Cast(value).AsDoubleValue()
+                          : Double::Cast(value).value();

[Florian Schneider, 2014/09/18 12:33:14]

Please align : and ?.

[Vyacheslav Egorov (Google), 2014/09/18 12:46:53]

Done.

+}
+
+
 void ConstantPropagator::VisitBinaryDoubleOp(
     BinaryDoubleOpInstr* instr) {
   const Object& left = instr->left()->definition()->constant_value();
   const Object& right = instr->right()->definition()->constant_value();
   if (IsNonConstant(left) || IsNonConstant(right)) {
     SetValue(instr, non_constant_);
-  } else if (IsConstant(left) && IsConstant(right)) {
-    ASSERT(left.IsSmi() || left.IsDouble());
-    ASSERT(right.IsSmi() || right.IsDouble());
-    double left_val = left.IsSmi()
-        ? Smi::Cast(left).AsDoubleValue() : Double::Cast(left).value();
-    double right_val = right.IsSmi()
-        ? Smi::Cast(right).AsDoubleValue() : Double::Cast(right).value();
+  } else if (left.IsInteger() && right.IsInteger()) {
+    SetValue(instr, non_constant_);
+  } else if (IsIntegerOrDouble(left) && IsIntegerOrDouble(right)) {
+    const double left_val = ToDouble(left);
+    const double right_val = ToDouble(right);
     double result_val = 0.0;
     switch (instr->op_kind()) {
       case Token::kADD:
         result_val = left_val + right_val;
         break;
       case Token::kSUB:
         result_val = left_val - right_val;
         break;
       case Token::kMUL:
         result_val = left_val * right_val;
@@ skipping 1544 matching lines @@
 
   // Insert materializations at environment uses.
   for (intptr_t i = 0; i < exits_collector_.exits().length(); i++) {
     CreateMaterializationAt(
         exits_collector_.exits()[i], alloc, alloc->cls(), *slots);
   }
 }
 
 
 }  // namespace dart